Index: branches/version-2_5-dev/html/install/index.php =================================================================== --- branches/version-2_5-dev/html/install/index.php (revision 18775) +++ branches/version-2_5-dev/html/install/index.php (revision 18786) @@ -131,5 +131,4 @@ $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,5 +225,4 @@ 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,5 +896,4 @@ $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,12 +927,4 @@ $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,12 +935,4 @@ $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,5 +943,4 @@ 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); Index: branches/version-2_5-dev/html/install/sql/column_comment.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/column_comment.sql (revision 18777) +++ branches/version-2_5-dev/html/install/sql/column_comment.sql (revision 18786) @@ -555,51 +555,8 @@ INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_member','create_date','作成日'); INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_member','login_date','ログイン日'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','question_id','質問ID'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','question_name','質問名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','question','質問内容'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','create_date','作成日時'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question','del_flg ','0:既定、1:削除'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','result_id','結果ID'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question_id','質問ID'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question_date','質問日'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question_name','質問名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','name01','回答者名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','name02','回答者名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','kana01','回答者名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','kana02','回答者名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','zip01','郵便番号1'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','zip02','郵便番号2'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','pref','都道府県'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','addr01','住所1'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','addr02','住所2'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','tel01','電話番号1'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','tel02','電話番号2'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','tel03','電話番号3'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','mail01','メールアドレス'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question01','回答内容'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question02','回答内容'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question03','回答内容'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question04','回答内容'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question05','回答内容'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','question06','回答内容'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','create_date','作成日時'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_question_result','del_flg ','0:既定、1:削除'); INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','product_id','この商品ID'); INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','relate_product_id','こんな商品ID'); INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','customer_id','顧客ID'); INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_bat_relate_products','create_date','集計日時'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_id','キャンペーンID'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_name','キャンペーン名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_point_rate','キャンペーンポイント'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','campaign_point_type','キャンペーンタイプ'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','start_date','キャンペーン開始期間'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','end_date','キャンペーン終了期間'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','search_condition','検索条件'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','del_flg','0:既定　1:削除'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','create_date','作成日時'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign','update_date','更新日時'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign_detail','campaign_id','キャンペーンID'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign_detail','product_id','キャンペーン名'); -INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_campaign_detail','campaign_point_rate','キャンペーンポイント'); INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_pagelayout','page_id','ページID 0はプレビュー用データ'); INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_pagelayout','page_name','ページ名称'); Index: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql (revision 18778) +++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql (revision 18786) @@ -228,35 +228,4 @@ ) TYPE=InnoDB; -CREATE TABLE dtb_mailmaga_template ( - template_id int auto_increment NOT NULL, - subject text, - charge_image text, - mail_method int, - header text, - body text, - main_title text, - main_comment text, - main_product_id int, - sub_title text, - sub_comment text, - sub_product_id01 int, - sub_product_id02 int, - sub_product_id03 int, - sub_product_id04 int, - sub_product_id05 int, - sub_product_id06 int, - sub_product_id07 int, - sub_product_id08 int, - sub_product_id09 int, - sub_product_id10 int, - sub_product_id11 int, - sub_product_id12 int, - del_flg smallint NOT NULL DEFAULT 0, - creator_id int NOT NULL, - create_date datetime NOT NULL, - update_date datetime, - PRIMARY KEY (template_id) -) TYPE=InnoDB; - CREATE TABLE dtb_send_history ( send_id int auto_increment NOT NULL, @@ -595,14 +564,4 @@ CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id(64)); - -CREATE TABLE dtb_customer_mail_temp ( - email varchar(50) NOT NULL UNIQUE, - mail_flag smallint, - temp_id varchar(50) NOT NULL, - end_flag smallint, - update_date datetime NOT NULL, - create_data datetime NOT NULL, - PRIMARY KEY (temp_id) -) TYPE=InnoDB; CREATE TABLE dtb_order ( @@ -685,5 +644,4 @@ memo09 text, memo10 text, - campaign_id int, PRIMARY KEY (order_id) ) TYPE=InnoDB; @@ -829,42 +787,4 @@ ) TYPE=InnoDB; -CREATE TABLE dtb_question ( - question_id int auto_increment NOT NULL, - question_name text, - question text, - create_date datetime NOT NULL, - del_flg smallint NOT NULL DEFAULT 0, - PRIMARY KEY (question_id) -) TYPE=InnoDB; - -CREATE TABLE dtb_question_result ( - result_id int auto_increment NOT NULL, - question_id int NOT NULL, - question_date datetime, - question_name text, - name01 text, - name02 text, - kana01 text, - kana02 text, - zip01 text, - zip02 text, - pref smallint, - addr01 text, - addr02 text, - tel01 text, - tel02 text, - tel03 text, - mail01 text, - question01 text, - question02 text, - question03 text, - question04 text, - question05 text, - question06 text, - create_date datetime NOT NULL, - del_flg smallint NOT NULL DEFAULT 0, - PRIMARY KEY (result_id) -) TYPE=InnoDB; - CREATE TABLE dtb_bat_relate_products ( product_id int, @@ -872,30 +792,4 @@ customer_id int, create_date datetime -) TYPE=InnoDB; - -CREATE TABLE dtb_campaign ( - campaign_id int auto_increment NOT NULL, - campaign_name text, - campaign_point_rate numeric NOT NULL, - campaign_point_type smallint, - start_date datetime NOT NULL, - end_date datetime NOT NULL, - directory_name text NOT NULL, - limit_count int NOT NULL DEFAULT 0, - total_count int NOT NULL DEFAULT 0, - orverlapping_flg smallint NOT NULL DEFAULT 0, - cart_flg smallint NOT NULL DEFAULT 0, - deliv_free_flg smallint NOT NULL DEFAULT 0, - search_condition text, - del_flg smallint NOT NULL DEFAULT 0, - create_date datetime NOT NULL, - update_date datetime NOT NULL, - PRIMARY KEY (campaign_id) -) TYPE=InnoDB; - -CREATE TABLE dtb_campaign_detail ( - campaign_id int NOT NULL, - product_id int NOT NULL, - campaign_point_rate numeric NOT NULL ) TYPE=InnoDB; @@ -962,23 +856,4 @@ ) TYPE=InnoDB; -CREATE TABLE dtb_user_regist ( - user_id int auto_increment NOT NULL, - org_name text, - post_name text, - name01 text, - name02 text, - kana01 text, - kana02 text, - email text NOT NULL, - url text, - note text, - secret_key varchar(50) NOT NULL UNIQUE, - status smallint NOT NULL, - del_flg smallint DEFAULT 0, - create_date datetime NOT NULL, - update_date datetime NOT NULL, - PRIMARY KEY (user_id) -) TYPE=InnoDB; - CREATE TABLE dtb_templates ( @@ -1059,11 +934,4 @@ ) TYPE=InnoDB; -CREATE TABLE mtb_srank ( - id smallint, - name text, - rank smallint NOT NULL DEFAULT 0, - PRIMARY KEY (id) -) TYPE=InnoDB; - CREATE TABLE mtb_status ( id smallint, Index: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql (revision 18777) +++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql (revision 18786) @@ -228,35 +228,4 @@ ); -CREATE TABLE dtb_mailmaga_template ( - template_id serial NOT NULL, - subject text, - charge_image text, - mail_method int, - header text, - body text, - main_title text, - main_comment text, - main_product_id int, - sub_title text, - sub_comment text, - sub_product_id01 int, - sub_product_id02 int, - sub_product_id03 int, - sub_product_id04 int, - sub_product_id05 int, - sub_product_id06 int, - sub_product_id07 int, - sub_product_id08 int, - sub_product_id09 int, - sub_product_id10 int, - sub_product_id11 int, - sub_product_id12 int, - del_flg smallint NOT NULL DEFAULT 0, - creator_id int NOT NULL, - create_date timestamp NOT NULL DEFAULT now(), - update_date timestamp, - PRIMARY KEY (template_id) -); - CREATE TABLE dtb_send_history ( send_id serial NOT NULL, @@ -596,14 +565,4 @@ CREATE INDEX dtb_customer_mobile_phone_id_key ON dtb_customer (mobile_phone_id); - -CREATE TABLE dtb_customer_mail_temp ( - email text NOT NULL UNIQUE, - mail_flag smallint, - temp_id text NOT NULL, - end_flag smallint, - update_date timestamp NOT NULL DEFAULT Now(), - create_data timestamp NOT NULL DEFAULT Now(), - PRIMARY KEY (temp_id) -); CREATE TABLE dtb_order ( @@ -686,5 +645,4 @@ memo09 text, memo10 text, - campaign_id int, PRIMARY KEY (order_id) ); @@ -830,42 +788,4 @@ ); -CREATE TABLE dtb_question ( - question_id serial NOT NULL, - question_name text, - question text, - create_date timestamp NOT NULL DEFAULT now(), - del_flg smallint NOT NULL DEFAULT 0, - PRIMARY KEY (question_id) -); - -CREATE TABLE dtb_question_result ( - result_id serial NOT NULL, - question_id int NOT NULL, - question_date timestamp, - question_name text, - name01 text, - name02 text, - kana01 text, - kana02 text, - zip01 text, - zip02 text, - pref smallint, - addr01 text, - addr02 text, - tel01 text, - tel02 text, - tel03 text, - mail01 text, - question01 text, - question02 text, - question03 text, - question04 text, - question05 text, - question06 text, - create_date timestamp NOT NULL DEFAULT now(), - del_flg smallint NOT NULL DEFAULT 0, - PRIMARY KEY (result_id) -); - CREATE TABLE dtb_bat_relate_products ( product_id int, @@ -873,30 +793,4 @@ customer_id int, create_date timestamp DEFAULT now() -); - -CREATE TABLE dtb_campaign ( - campaign_id serial NOT NULL, - campaign_name text, - campaign_point_rate numeric NOT NULL, - campaign_point_type smallint, - start_date timestamp NOT NULL, - end_date timestamp NOT NULL, - directory_name text NOT NULL, - limit_count int NOT NULL DEFAULT 0, - total_count int NOT NULL DEFAULT 0, - orverlapping_flg smallint NOT NULL DEFAULT 0, - cart_flg smallint NOT NULL DEFAULT 0, - deliv_free_flg smallint NOT NULL DEFAULT 0, - search_condition text, - del_flg smallint NOT NULL DEFAULT 0, - create_date timestamp NOT NULL, - update_date timestamp NOT NULL DEFAULT now(), - PRIMARY KEY (campaign_id) -); - -CREATE TABLE dtb_campaign_detail ( - campaign_id int NOT NULL, - product_id int NOT NULL, - campaign_point_rate numeric NOT NULL ); @@ -963,23 +857,4 @@ ); -CREATE TABLE dtb_user_regist ( - user_id serial NOT NULL, - org_name text, - post_name text, - name01 text, - name02 text, - kana01 text, - kana02 text, - email text NOT NULL, - url text, - note text, - secret_key text NOT NULL UNIQUE, - status smallint NOT NULL, - del_flg smallint DEFAULT 0, - create_date timestamp NOT NULL, - update_date timestamp NOT NULL DEFAULT now(), - PRIMARY KEY (user_id) -); - create table dtb_templates ( template_code text NOT NULL, @@ -1057,11 +932,4 @@ ); -CREATE TABLE mtb_srank ( - id smallint, - name text, - rank smallint NOT NULL DEFAULT 0, - PRIMARY KEY (id) -); - CREATE TABLE mtb_status ( id smallint, Index: branches/version-2_5-dev/html/install/sql/table_comment.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/table_comment.sql (revision 18235) +++ branches/version-2_5-dev/html/install/sql/table_comment.sql (revision 18786) @@ -33,9 +33,5 @@ INSERT INTO dtb_table_comment(table_name,description) values ('mtb_pref','都道府県ﾏｽﾀ'); INSERT INTO dtb_table_comment(table_name,description) values ('dtb_member','管理者'); -INSERT INTO dtb_table_comment(table_name,description) values ('dtb_question','質問'); -INSERT INTO dtb_table_comment(table_name,description) values ('dtb_question_result','質問結果'); INSERT INTO dtb_table_comment(table_name,description) values ('dtb_bat_relate_products','こんな商品も買っています'); -INSERT INTO dtb_table_comment(table_name,description) values ('dtb_campaign','キャンペーン'); -INSERT INTO dtb_table_comment(table_name,description) values ('dtb_campaign_detail','キャンペーン詳細'); INSERT INTO dtb_table_comment(table_name,description) values ('dtb_pagelayout','ページレイアウト'); INSERT INTO dtb_table_comment(table_name,description) values ('dtb_bloc','ブロック'); Index: branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_mysql.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_mysql.sql (revision 15079) +++ (revision ) @@ -1,43 +1,0 @@ -CREATE TABLE dtb_campaign_order ( - campaign_order_id int auto_increment primary key NOT NULL, - order_id int DEFAULT 0, - campaign_id int NOT NULL, - customer_id int NOT NULL, - message text, - order_name01 text, - order_name02 text, - order_kana01 text, - order_kana02 text, - order_email text, - order_tel01 text, - order_tel02 text, - order_tel03 text, - order_fax01 text, - order_fax02 text, - order_fax03 text, - order_zip01 text, - order_zip02 text, - order_pref text, - order_addr01 text, - order_addr02 text, - order_sex smallint, - order_birth datetime, - order_job int, - deliv_name01 text, - deliv_name02 text, - deliv_kana01 text, - deliv_kana02 text, - deliv_tel01 text, - deliv_tel02 text, - deliv_tel03 text, - deliv_fax01 text, - deliv_fax02 text, - deliv_fax03 text, - deliv_zip01 text, - deliv_zip02 text, - deliv_pref text, - deliv_addr01 text, - deliv_addr02 text, - payment_total numeric, - create_date datetime NOT NULL -) TYPE=InnoDB ; Index: branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_pgsql.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/add/dtb_campaign_order_pgsql.sql (revision 15079) +++ (revision ) @@ -1,43 +1,0 @@ -CREATE TABLE dtb_campaign_order ( - campaign_order_id serial NOT NULL, - order_id int4 DEFAULT 0, - campaign_id int4 NOT NULL, - customer_id int4 NOT NULL, - message text, - order_name01 text, - order_name02 text, - order_kana01 text, - order_kana02 text, - order_email text, - order_tel01 text, - order_tel02 text, - order_tel03 text, - order_fax01 text, - order_fax02 text, - order_fax03 text, - order_zip01 text, - order_zip02 text, - order_pref text, - order_addr01 text, - order_addr02 text, - order_sex int2, - order_birth timestamp, - order_job int4, - deliv_name01 text, - deliv_name02 text, - deliv_kana01 text, - deliv_kana02 text, - deliv_tel01 text, - deliv_tel02 text, - deliv_tel03 text, - deliv_fax01 text, - deliv_fax02 text, - deliv_fax03 text, - deliv_zip01 text, - deliv_zip02 text, - deliv_pref text, - deliv_addr01 text, - deliv_addr02 text, - payment_total numeric, - create_date timestamp NOT NULL DEFAULT now() -); Index: branches/version-2_5-dev/html/install/sql/drop_table.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/drop_table.sql (revision 18777) +++ branches/version-2_5-dev/html/install/sql/drop_table.sql (revision 18786) @@ -9,5 +9,4 @@ DROP TABLE dtb_payment; DROP TABLE dtb_mailtemplate; -DROP TABLE dtb_mailmaga_template; DROP TABLE dtb_send_history; DROP TABLE dtb_send_customer; @@ -29,6 +28,4 @@ DROP TABLE dtb_mail_history; DROP TABLE dtb_customer; -DROP TABLE dtb_customer_mail; -DROP TABLE dtb_customer_mail_temp; DROP TABLE dtb_order; DROP TABLE dtb_order_temp; @@ -37,9 +34,5 @@ DROP TABLE mtb_pref; DROP TABLE dtb_member; -DROP TABLE dtb_question; -DROP TABLE dtb_question_result; DROP TABLE dtb_bat_relate_products; -DROP TABLE dtb_campaign; -DROP TABLE dtb_campaign_detail; DROP TABLE dtb_pagelayout; DROP TABLE dtb_bloc; @@ -47,5 +40,4 @@ DROP TABLE dtb_csv; DROP TABLE dtb_csv_sql; -DROP TABLE dtb_user_regist; DROP TABLE dtb_templates; DROP TABLE dtb_table_comment; @@ -59,5 +51,4 @@ DROP TABLE mtb_status_image; DROP TABLE mtb_status; -DROP TABLE mtb_srank; DROP TABLE mtb_site_control_track_back; DROP TABLE mtb_site_control_affiliate; Index: branches/version-2_5-dev/html/install/sql/insert_data.sql =================================================================== --- branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 18783) +++ branches/version-2_5-dev/html/install/sql/insert_data.sql (revision 18786) @@ -566,9 +566,4 @@ INSERT INTO mtb_class VALUES ('1', '規格無し',0); INSERT INTO mtb_class VALUES ('2', '規格有り',1); -INSERT INTO mtb_srank VALUES ('1', '1',0); -INSERT INTO mtb_srank VALUES ('2', '2',1); -INSERT INTO mtb_srank VALUES ('3', '3',2); -INSERT INTO mtb_srank VALUES ('4', '4',3); -INSERT INTO mtb_srank VALUES ('5', '5',4); INSERT INTO mtb_status VALUES ('1', 'NEW',0); INSERT INTO mtb_status VALUES ('2', '残りわずか',1); Index: branches/version-2_5-dev/data/class/SC_CampaignSession.php =================================================================== --- branches/version-2_5-dev/data/class/SC_CampaignSession.php (revision 18701) +++ branches/version-2_5-dev/data/class/SC_CampaignSession.php (revision 18786) @@ -22,5 +22,9 @@ */ -/* キャンペーン管理クラス */ +/* キャンペーン管理クラス + * + * @deprecated キャンペーン機能は廃止のため使用しない. + * このクラスに依存している実装を改修後, このクラスを削除する. + */ class SC_CampaignSession { var $key; Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CampaignDesign.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CampaignDesign.php (revision 18701) +++ (revision ) @@ -1,170 +1,0 @@ -tpl_mainpage = 'contents/campaign_design.tpl'; - $this->tpl_subnavi = 'contents/subnavi.tpl'; - $this->tpl_subno = "campaign"; - $this->tpl_mainno = 'contents'; - $this->header_row = 13; - $this->contents_row = 13; - $this->footer_row = 13; - $this->tpl_subtitle = 'キャンペーンデザイン編集'; - } - - /** - * Page のプロセス. - * - * @return void - */ - function process() { - $objView = new SC_AdminView(); - $objQuery = new SC_Query(); - - // 認証可否の判定 - $objSess = new SC_Session(); - SC_Utils_Ex::sfIsSuccess($objSess); - - // キャンペーンデータを引き継ぎ - if($_POST['mode'] != "") { - $arrForm = $_POST; - } else { - $arrForm = $_GET; - } - - // 正しく値が取得できない場合はキャンペーンTOPへ - if($arrForm['campaign_id'] == "" || $arrForm['status'] == "") { - $this->sendRedirect($this->getLocation(URL_CAMPAIGN_TOP)); - exit; - } - - switch($arrForm['status']) { - case 'active': - $status = CAMPAIGN_TEMPLATE_ACTIVE; - $this->tpl_campaign_title = "キャンペーン中デザイン編集"; - break; - case 'end': - $status = CAMPAIGN_TEMPLATE_END; - $this->tpl_campaign_title = "キャンペーン終了デザイン編集"; - break; - default: - break; - } - - // ディレクトリ名を取得名 - $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($arrForm['campaign_id'])); - // キャンペーンテンプレート格納ディレクトリ - $campaign_dir = CAMPAIGN_TEMPLATE_PATH . $directory_name . "/" .$status; - - switch($_POST['mode']) { - case 'regist': - // ファイルを更新 - SC_Utils_Ex::sfWriteFile($arrForm['header'], $campaign_dir."header.tpl", "w"); - SC_Utils_Ex::sfWriteFile($arrForm['contents'], $campaign_dir."contents.tpl", "w"); - SC_Utils_Ex::sfWriteFile($arrForm['footer'], $campaign_dir."footer.tpl", "w"); - // サイトフレーム作成 - $site_frame = $arrForm['header']."\n"; - $site_frame .= ''."\n"; - $site_frame .= ''."\n"; - $site_frame .= ''."\n"; - $site_frame .= $arrForm['footer']."\n"; - SC_Utils_Ex::sfWriteFile($site_frame, $campaign_dir."site_frame.tpl", "w"); - - // 完了メッセージ（プレビュー時は表示しない） - $this->tpl_onload="alert('登録が完了しました。');"; - break; - case 'preview': - // プレビューを書き出し別窓で開く - SC_Utils_Ex::sfWriteFile($arrForm['header'] . $arrForm['contents'] . $arrForm['footer'], $campaign_dir."preview.tpl", "w"); - $this->tpl_onload = "win02('./campaign_preview.php?status=". $arrForm['status'] ."&campaign_id=". $arrForm['campaign_id'] ."', 'preview', '600', '400');"; - $this->header_data = $arrForm['header']; - $this->contents_data = $arrForm['contents']; - $this->footer_data = $arrForm['footer']; - break; - case 'return': - // 登録ページへ戻る - $this->sendRedirect($this->getLocation(URL_CAMPAIGN_TOP)); - exit; - break; - default: - break; - } - - if ($arrForm['header_row'] != ''){ - $this->header_row = $arrForm['header_row']; - } - if ($arrForm['contents_row'] != ''){ - $this->contents_row = $arrForm['contents_row']; - } - if ($arrForm['footer_row'] != ''){ - $this->footer_row = $arrForm['footer_row']; - } - - if($_POST['mode'] != 'preview') { - // ヘッダーファイルの読み込み - $this->header_data = file_get_contents($campaign_dir . "header.tpl"); - // コンテンツファイルの読み込み - $this->contents_data = file_get_contents($campaign_dir . "contents.tpl"); - // フッターファイルの読み込み - $this->footer_data = file_get_contents($campaign_dir . "footer.tpl"); - } - - // フォームの値を格納 - $this->arrForm = $arrForm; - - // 画面の表示 - $objView->assignobj($this); - $objView->display(MAIN_FRAME); - } - - /** - * デストラクタ. - * - * @return void - */ - function destroy() { - parent::destroy(); - } -} -?> Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Campaign.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Campaign.php (revision 18701) +++ (revision ) @@ -1,432 +1,0 @@ -tpl_mainpage = 'contents/campaign.tpl'; - $this->tpl_subnavi = 'contents/subnavi.tpl'; - $this->tpl_subno = "campaign"; - $this->tpl_mainno = 'contents'; - $this->tpl_subtitle = 'キャンペーン管理'; - // カートに商品が入っているにチェックが入っているかチェック - $this->tpl_onload = "fnIsCartOn();"; - } - - /** - * Page のプロセス. - * - * @return void - */ - function process() { - //---- 認証可否の判定 - $objSess = new SC_Session(); - SC_Utils_Ex::sfIsSuccess($objSess); - - $objView = new SC_AdminView(); - $objQuery = new SC_Query(); - $objFormParam = new SC_FormParam(); - $objCSV = new SC_Helper_CSV_Ex(); - - // パラメータ情報の初期化 - $this->lfInitParam($objFormParam); - // フォームの値をセット - $objFormParam->setParam($_POST); - - // 編集処理の場合は状態を保持 - $this->is_update = isset($_POST['is_update']) ? $_POST['is_update'] : ""; - - // フォームの値をテンプレートへ渡す - $this->arrForm = $objFormParam->getHashArray(); - $campaign_id = isset($_POST['campaign_id']) ? $_POST['campaign_id'] : ""; - - if (!isset($_POST['mode'])) $_POST['mode'] = ""; - - switch($_POST['mode']) { - // 新規登録/編集登録 - case 'regist': - // エラーチェック - $this->arrErr = $this->lfErrorCheck($campaign_id, $objQuery, $objFormParam); - - if(count($this->arrErr) <= 0) { - // 登録 - $this->lfRegistCampaign($campaign_id, $objQuery, $objFormParam); - - // キャンペーンTOPへリダイレクト - $this->sendRedirect($this->getLocation(URL_CAMPAIGN_TOP)); - exit; - } - - break; - // 編集押下時 - case 'update': - // キャンペーン情報を取得 - $this->arrForm = $this->lfGetCampaign($campaign_id, $objQuery); - $this->is_update = true; - break; - // 削除押下時 - case 'delete': - // 削除 - $this->lfDeleteCampaign($campaign_id, $objQuery); - // キャンペーンTOPへリダイレクト - $this->sendRedirect($this->getLocation(URL_CAMPAIGN_TOP)); - exit; - break; - // CSV出力 - case 'csv': - // オプションの指定 - $option = "ORDER BY create_date DESC"; - - // CSV出力タイトル行の作成 - $arrCsvOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(4, 'status = 1')); - - if (count($arrCsvOutput) <= 0) break; - - $arrCsvOutputCols = $arrCsvOutput['col']; - $arrCsvOutputTitle = $arrCsvOutput['disp_name']; - $head = SC_Utils_Ex::sfGetCSVList($arrCsvOutputTitle); - $data = $objCSV->lfGetCSV("dtb_campaign_order", "campaign_id = ?", $option, array($campaign_id), $arrCsvOutputCols); - - // CSVを送信する。 - SC_Utils_Ex::sfCSVDownload($head.$data); - exit; - break; - default: - break; - } - - // キャンペーン一覧取得 - $this->arrCampaign = $this->lfGetCampaignList($objQuery); - $this->campaign_id = $campaign_id; - - // キャンペーン期間用 - $objDate = new SC_Date(); - $this->arrYear = $objDate->getYear(min(date('Y'), $this->arrForm['start_year'])); - $this->arrMonth = $objDate->getMonth(); - $this->arrDay = $objDate->getDay(); - $this->arrHour = $objDate->getHour(); - $this->arrMinutes = $objDate->getMinutes(); - - //---- ページ表示 - $objView->assignobj($this); - $objView->display(MAIN_FRAME); - } - - /** - * デストラクタ. - * - * @return void - */ - function destroy() { - parent::destroy(); - } - - /** - * 入力情報の初期化 - */ - function lfInitParam(&$objFormParam) { - - $objFormParam->addParam("キャンペーン名", "campaign_name", MTEXT_LEN, "KVa", array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK")); - - $objFormParam->addParam("開始日時", "start_year", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("開始日時", "start_month", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("開始日時", "start_day", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("開始日時", "start_hour", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("開始日時", "start_minute", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - - $objFormParam->addParam("停止日時", "end_year", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("停止日時", "end_month", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("停止日時", "end_day", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("停止日時", "end_hour", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("停止日時", "end_minute", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - - $objFormParam->addParam("ディレクトリ名", "directory_name", MTEXT_LEN, "KVa", array("EXIST_CHECK","ALNUM_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK")); - $objFormParam->addParam("申込数制御", "limit_count", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("重複申込制御", "orverlapping_flg", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("カートに商品を入れる", "cart_flg", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - $objFormParam->addParam("送料無料設定", "deliv_free_flg", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); - - } - - /* - * 関数名：lfErrorCheck() - * 引数1 ：キャンペーンID - * 説明　：エラーチェック - * 戻り値：エラー文字格納配列 - */ - function lfErrorCheck($campaign_id = "", &$objQuery, &$objFormParam) { - - $arrList = $objFormParam->getHashArray(); - $objErr = new SC_CheckError($arrList); - $objErr->arrErr = $objFormParam->checkError(); - - $objErr->doFunc(array("開始日時", "start_year", "start_month", "start_day", "start_hour", "start_minute", "0"), array("CHECK_DATE2")); - $objErr->doFunc(array("停止日時", "end_year", "end_month", "end_day", "end_hour", "end_minute", "0"), array("CHECK_DATE2")); - $objErr->doFunc(array("開始日時", "停止日時", "start_year", "start_month", "start_day", "start_hour", "start_minute", "00", "end_year", "end_month", "end_day", "end_hour", "end_minute", "59"), array("CHECK_SET_TERM2")); - - if (!is_writable(CAMPAIGN_TEMPLATE_PATH)) { - $objErr->arrErr['campaign_template_path'] = "※" . CAMPAIGN_TEMPLATE_PATH . " へ書き込み権限を与えてください。
"; - } - if (!is_writable(CAMPAIGN_PATH)) { - $objErr->arrErr['campaign_path'] = "※" . CAMPAIGN_PATH . " へ書き込み権限を与えてください。
"; - } - - if(count($objErr->arrErr) <= 0) { - - // 編集時用に元のディレクトリ名を取得する。 - if($campaign_id != "") { - $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id)); - } else { - $directory_name = ""; - } - - // 同名のフォルダが存在する場合はエラー - if(file_exists(CAMPAIGN_TEMPLATE_PATH.$arrList['directory_name']) && $directory_name != $arrList['directory_name']) { - $objErr->arrErr['directory_name'] = "※ 同名のディレクトリがすでに存在します。
"; - } - $ret = $objQuery->get("dtb_campaign", "directory_name", "directory_name = ? AND del_flg = 0", array($arrList['directory_name'])); - // DBにすでに登録されていないかチェック - if($ret != "" && $directory_name != $arrList['directory_name']) { - $objErr->arrErr['directory_name'] = "※ すでに登録されているディレクトリ名です。
"; - } - } - - return $objErr->arrErr; - } - - /* - * 関数名：lfRegistCampaign() - * 引数1 ：キャンペーンID(アップデート時に指定) - * 説明　：キャンペーン登録/更新 - * 戻り値：無し - */ - function lfRegistCampaign($campaign_id = "", &$objQuery, &$objFormParam) { - - $objSiteInfo = new SC_SiteInfo(); - $arrInfo = $objSiteInfo->data; - $arrList = $objFormParam->getHashArray(); - - // 開始日時・終了日時整形 - $start_date = $arrList['start_year']."-".sprintf("%02d", $arrList['start_month'])."-".sprintf("%02d", $arrList['start_day'])." ".sprintf("%02d", $arrList['start_hour']).":".sprintf("%02d", $arrList['start_minute']).":00"; - $end_date = $arrList['end_year']."-".sprintf("%02d", $arrList['end_month'])."-".sprintf("%02d", $arrList['end_day'])." ".sprintf("%02d", $arrList['end_hour']).":".sprintf("%02d", $arrList['end_minute']).":00"; - - // ポイントレートは設定されていなければ0を挿入 - if($arrInfo['point_rate'] == "") $arrInfo['point_rate'] = "0"; - // フラグは設定されていなければ0を挿入 - if(!$arrList['limit_count']) $arrList['limit_count'] = "0"; - if(!$arrList['orverlapping_flg']) $arrList['orverlapping_flg'] = "0"; - if(!$arrList['cart_flg']) $arrList['cart_flg'] = "0"; - if(!$arrList['deliv_free_flg']) $arrList['deliv_free_flg'] = "0"; - - $sqlval['campaign_name'] = $arrList['campaign_name']; - $sqlval['campaign_point_rate'] = $arrInfo['point_rate']; - $sqlval['start_date'] = $start_date; - $sqlval['end_date'] = $end_date; - $sqlval['directory_name'] = $arrList['directory_name']; - $sqlval['limit_count'] = $arrList['limit_count']; - $sqlval['orverlapping_flg'] = $arrList['orverlapping_flg']; - $sqlval['cart_flg'] = $arrList['cart_flg']; - $sqlval['deliv_free_flg'] = $arrList['deliv_free_flg']; - $sqlval['update_date'] = "now()"; - - // キャンペーンIDで指定されている場合はupdate - if($campaign_id != "") { - - // 元のディレクトリ名を取得名 - $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id)); - // ファイル名を変更 - @rename(CAMPAIGN_TEMPLATE_PATH . $directory_name , CAMPAIGN_TEMPLATE_PATH . $arrList['directory_name']); - @rename(CAMPAIGN_PATH . $directory_name , CAMPAIGN_PATH . $arrList['directory_name']); - - // update - $objQuery->update("dtb_campaign", $sqlval, "campaign_id = ?", array($campaign_id)); - - } else { - - // キャンペーンページディレクトリ作成 - $this->lfCreateTemplate(CAMPAIGN_TEMPLATE_PATH, $arrList['directory_name'], $objFormParam); - - $sqlval['create_date'] = "now()"; - // insert - $objQuery->insert("dtb_campaign", $sqlval); - } - } - - /* - * 関数名：lfGetCampaignList() - * 説明　：キャンペーン一覧を取得 - * 戻り値：キャンペーン一覧配列 - */ - function lfGetCampaignList(&$objQuery) { - - $col = "campaign_id,campaign_name,directory_name,total_count"; - $objQuery->setOrder("update_date DESC"); - $arrRet = $objQuery->select($col, "dtb_campaign", "del_flg = 0"); - - return $arrRet; - } - - /* - * 関数名：lfGetCampaign() - * 引数1 ：キャンペーンID - * 説明　：キャンペーン情報取得 - * 戻り値：キャンペーン情報配列 - */ - function lfGetCampaign($campaign_id, &$objQuery) { - - $col = "campaign_id,campaign_name,start_date,end_date,directory_name,limit_count,orverlapping_flg,cart_flg,deliv_free_flg"; - $arrRet = $objQuery->select($col, "dtb_campaign", "campaign_id = ?", array($campaign_id)); - - // 開始日時・停止日時を分解 - $start_date = (date("Y/m/d/H/i/s" , strtotime($arrRet[0]['start_date']))); - list($arrRet[0]['start_year'],$arrRet[0]['start_month'],$arrRet[0]['start_day'],$arrRet[0]['start_hour'], $arrRet[0]['start_minute'], $arrRet[0]['start_second']) = split("/", $start_date); - $end_date = (date("Y/m/d/H/i/s" , strtotime($arrRet[0]['end_date']))); - list($arrRet[0]['end_year'],$arrRet[0]['end_month'],$arrRet[0]['end_day'],$arrRet[0]['end_hour'], $arrRet[0]['end_minute'], $arrRet[0]['end_second']) = split("/", $end_date); - - return $arrRet[0]; - } - - /* - * 関数名：lfDeleteCampaign() - * 引数1 ：キャンペーンID - * 説明　：キャンペーン削除 - * 戻り値：無し - */ - function lfDeleteCampaign($campaign_id, &$objQuery) { - $objFileManager = new SC_Helper_FileManager_Ex(); - - // ディレクトリ名を取得名 - $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($campaign_id)); - // ファイルを削除 - $objFileManager->sfDeleteDir(CAMPAIGN_TEMPLATE_PATH . $directory_name); - $objFileManager->sfDeleteDir(CAMPAIGN_PATH . $directory_name); - - $sqlval['del_flg'] = 1; - $sqlval['update_date'] = "now()"; - // delete - $objQuery->update("dtb_campaign", $sqlval, "campaign_id = ?", array($campaign_id)); - } - - /* - * 関数名：lfCreateTemplate() - * 引数1 ：ディレクトリパス - * 引数2 ：作成ファイル名 - * 説明　：キャンペーンの初期テンプレート作成 - * 戻り値：無し - */ - function lfCreateTemplate($dir, $file, &$objFormParam) { - - $objFileManager = new SC_Helper_FileManager_Ex(); - $arrRet = $objFormParam->getHashArray(); - - - // 作成ファイルディレクトリ - $create_dir = $dir . $file; - $create_active_dir = $create_dir . "/" . CAMPAIGN_TEMPLATE_ACTIVE; - $create_end_dir = $create_dir . "/" . CAMPAIGN_TEMPLATE_END; - // デフォルトファイルディレクトリ - $default_dir = TEMPLATE_DIR . CAMPAIGN_TEMPLATE_DIR; - $default_active_dir = $default_dir . "/" . CAMPAIGN_TEMPLATE_ACTIVE; - $default_end_dir = $default_dir . "/" . CAMPAIGN_TEMPLATE_END; - - $ret = $objFileManager->sfCreateFile($create_dir, 0755); - $ret = $objFileManager->sfCreateFile($create_active_dir, 0755); - $ret = $objFileManager->sfCreateFile($create_end_dir, 0755); - - // キャンペーン実行PHPをコピー - $ret = $objFileManager->sfCreateFile(CAMPAIGN_PATH . $file); - copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "index.php", CAMPAIGN_PATH . $file . "/index.php"); - copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "application.php", CAMPAIGN_PATH . $file . "/application.php"); - copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "complete.php", CAMPAIGN_PATH . $file . "/complete.php"); - copy(HTML_PATH . CAMPAIGN_TEMPLATE_DIR . "entry.php", CAMPAIGN_PATH . $file . "/entry.php"); - - // デフォルトテンプレート作成(キャンペーン中) - $header = $this->lfGetFileContents($default_active_dir."header.tpl"); - SC_Utils_Ex::sfWriteFile($header, $create_active_dir."header.tpl", "w"); - $contents = $this->lfGetFileContents($default_active_dir."contents.tpl"); - if(!$arrRet['cart_flg']) { - $contents .= "\n" . '' . "\n"; - $contents .= $this->lfGetFileContents(CAMPAIGN_BLOC_PATH . "login.tpl"); - $contents .= ''."\n"; - $contents .= $this->lfGetFileContents(CAMPAIGN_BLOC_PATH . "entry.tpl"); - } - SC_Utils_Ex::sfWriteFile($contents, $create_active_dir."contents.tpl", "w"); - $footer = $this->lfGetFileContents($default_active_dir."footer.tpl"); - SC_Utils_Ex::sfWriteFile($footer, $create_active_dir."footer.tpl", "w"); - - // サイトフレーム作成 - $site_frame = $header."\n"; - $site_frame .= ''."\n"; - $site_frame .= ''."\n"; - $site_frame .= ''."\n"; - $site_frame .= $footer."\n"; - SC_Utils_Ex::sfWriteFile($site_frame, $create_active_dir."site_frame.tpl", "w"); - - /* デフォルトテンプレート作成(キャンペーン終了) */ - $header = $this->lfGetFileContents($default_end_dir."header.tpl"); - SC_Utils_Ex::sfWriteFile($header, $create_end_dir."header.tpl", "w"); - $contents = $this->lfGetFileContents($default_end_dir."contents.tpl"); - SC_Utils_Ex::sfWriteFile($contents, $create_end_dir."contents.tpl", "w"); - $footer = $this->lfGetFileContents($default_end_dir."footer.tpl"); - SC_Utils_Ex::sfWriteFile($footer, $create_end_dir."footer.tpl", "w"); - } - - /* - * 関数名：lfGetFileContents() - * 引数1 ：ファイルパス - * 説明　：ファイル読込 - * 戻り値：無し - */ - function lfGetFileContents($read_file) { - - if(file_exists($read_file)) { - $contents = file_get_contents($read_file); - } else { - $contents = ""; - } - - return $contents; - } -} -?> Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CampaignCreateTag.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CampaignCreateTag.php (revision 18701) +++ (revision ) @@ -1,205 +1,0 @@ -tpl_mainpage = 'contents/campaign_create_tag.tpl'; - $this->tpl_mainno = 'create'; - $this->tpl_subtitle = '商品設定'; - } - - /** - * Page のプロセス. - * - * @return void - */ - function process() { - $objView = new SC_AdminView(); - $objSess = new SC_Session(); - $objQuery = new SC_Query(); - $objDb = new SC_Helper_DB_Ex(); - - // 認証可否の判定 - SC_Utils_Ex::sfIsSuccess($objSess); - - switch($_POST['mode']) { - - // 商品検索 - case 'search': - // POST値の引き継ぎ - $this->arrForm = $_POST; - // 入力文字の強制変換 - $this->lfConvertParam(); - - $where = "del_flg = 0"; - - // where句生成 - foreach ($this->arrForm as $key => $val) { - if($val == "") { - continue; - } - - switch ($key) { - case 'search_name': - $where .= " AND name ILIKE ?"; - $arrval[] = "%$val%"; - break; - case 'search_category_id': - list($tmp_where, $tmp_arrval) = $objDb->sfGetCatWhere($val); - if($tmp_where != "") { - $where.= " AND product_id IN (SELECT product_id FROM dtb_product_categories WHERE " . $tmp_where . ")"; - $arrval = array_merge((array)$arrval, (array)$tmp_arrval); - } - break; - case 'search_product_id': - $where .= " AND product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code LIKE ? GROUP BY product_id)"; - $arrval[] = "$val%"; - break; - default: - break; - } - } - - $order = "update_date DESC, product_id DESC "; - - // 読み込む列とテーブルの指定 - $col = "product_id, name, category_id, main_list_image, status, product_code, price01, stock, stock_unlimited"; - $from = "vw_products_nonclass AS noncls "; - - // 行数の取得 - $linemax = $objQuery->count("dtb_products", $where, $arrval); - $this->tpl_linemax = $linemax; // 何件が該当しました。表示用 - - // ページ送りの処理 - if(is_numeric($_POST['search_page_max'])) { - $page_max = $_POST['search_page_max']; - } else { - $page_max = SEARCH_PMAX; - } - - // ページ送りの取得 - $objNavi = new SC_PageNavi($_POST['search_pageno'], $linemax, $page_max, "fnNaviSearchOnlyPage", NAVI_PMAX); - $this->tpl_strnavi = $objNavi->strnavi; // 表示文字列 - $startno = $objNavi->start_row; - - // 取得範囲の指定(開始行番号、行数のセット) - if(DB_TYPE != "mysql") $objQuery->setLimitOffset($page_max, $startno); - // 表示順序 - $objQuery->setOrder($order); - - // 検索結果の取得 - $this->arrProducts = $objQuery->select($col, $from, $where, $arrval); - break; - - // タグ表示 - case 'view': - - // タグを生成 - $create_tag = $this->lfGetCreateTag($_POST['product_id']); - $this->tpl_create_tag = $create_tag; - break; - } - - // カテゴリ取得 - $this->arrCatList = $objDb->sfGetCategoryList(); - - //----　ページ表示 - $objView->assignobj($this); - $objView->display($this->tpl_mainpage); - } - - /** - * デストラクタ. - * - * @return void - */ - function destroy() { - parent::destroy(); - } - - - /** - * 取得する文字数の変換を行うメソッド - * - * @return void - */ - function lfConvertParam() { - /* - * 文字列の変換 - * K : 「半角(ﾊﾝｶｸ)片仮名」を「全角片仮名」に変換 - * C : 「全角ひら仮名」を「全角かた仮名」に変換 - * V : 濁点付きの文字を一文字に変換。"K","H"と共に使用します - * n : 「全角」数字を「半角(ﾊﾝｶｸ)」に変換 - */ - $arrConvList['search_name'] = "KVa"; - $arrConvList['search_product_code'] = "KVa"; - - // 文字変換 - foreach ($arrConvList as $key => $val) { - // POSTされてきた値のみ変換する。 - if(isset($this->arrForm[$key])) { - $this->arrForm[$key] = mb_convert_kana($this->arrForm[$key] ,$val); - } - } - } - - /** - * キャンペーンページのための商品用タグを生成するメソッド - * - * @param string $product_id 商品ID - * @return void - */ - - function lfGetCreateTag($product_id) { - // 書き込みタグ - $read_file = file_get_contents(CAMPAIGN_BLOC_PATH . "cart_tag.tpl"); - $read_file = ereg_replace("<{assign_product_id}>", $product_id, $read_file); - // カートタグ保存用ファイル作成 - $create_tag .= "\n"; - $create_tag .= $read_file; - - return $create_tag; - } - -} -?> Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php (revision 18701) +++ (revision ) @@ -1,350 +1,0 @@ -tpl_mainpage = 'contents/inquiry.tpl'; - $this->tpl_mainno = 'contents'; - $this->tpl_subnavi = 'contents/subnavi.tpl'; - $this->tpl_subno = "inquiry"; - $this->tpl_subtitle = 'アンケート管理'; - $this->arrCVSCOL = array( - - ); - - $this->arrCVSTITLE = array( - '回答ID', - '質問ID', - '回答日時', - 'アンケートタイトル', - '顧客名1', - '顧客名2', - '顧客名カナ1', - '顧客名カナ2', - '郵便番号1', - '郵便番号2', - '都道府県', - '住所1', - '住所2', - '電話番号1', - '電話番号2', - '電話番号3', - 'メールアドレス', - '回答1', - '回答2', - '回答3', - '回答4', - '回答5', - '回答6' - ); - } - - /** - * Page のプロセス. - * - * @return void - */ - function process() { - $objQuery = new SC_Query(); - $objView = new SC_AdminView(); - $objSess = new SC_Session(); - - // 認証可否の判定 - SC_Utils_Ex::sfIsSuccess($objSess); - - $arrActive = array( "0"=>"稼働", "1"=>"非稼働" ); - $arrQuestion = array( "0"=>"使用しない", "1"=>"テキストエリア", "2"=>"テキストボックス" - , "3"=>"チェックボックス", "4"=>"ラジオボタン" - ); - - $result = $objQuery->select('*, cast(create_date as date) as disp_date', 'dtb_question', 'del_flg = 0 ORDER BY question_id'); - $this->list_data = $result; - - if (!isset($_GET['mode'])) $_GET['mode'] = ""; - - // アンケートを作成ボタン押下時 - if ( $_GET['mode'] == 'regist' ){ - - for ( $i=0; $i 0 ) $temp_data[] = mb_convert_kana( trim ( $_POST["question"][$i]["option"][$j] ), "asKVn" ); - } - $_POST["question"][$i]["option"] = $temp_data; - } else { - $_POST["question"][$i]["option"] = NULL; - } - } - - $error = $this->lfErrCheck(); - - if ( ! $error ){ - // 新規登録 - if ( ! is_numeric($_POST['question_id']) ){ - - //登録 - $value = serialize($_POST); - if (DB_TYPE == "pgsql") { - $question_id = $objQuery->nextval('dtb_question', 'question_id'); - } - - $sql_val = array( 'question' => $value, 'question_name' => $_POST['title'] ,'question_id' => $question_id ,'create_date' => 'now()'); - $objQuery->insert('dtb_question', $sql_val); - $this->MESSAGE = "登録が完了しました"; - - if (DB_TYPE == "mysql") { - $question_id = $objQuery->nextval('dtb_question', 'question_id'); - } - - $this->QUESTION_ID = $question_id; - $this->reload(null, true); - - // 編集 - } else { - //編集 - $value = serialize($_POST); - $sql_val = array( 'question'=>$value, 'question_name'=>$_POST['title'] ); - $objQuery->update('dtb_question', $sql_val, 'question_id = ?', array($_POST['question_id']) ); - $this->MESSAGE = "編集が完了しました"; - $this->QUESTION_ID = $_POST['question_id']; - $this->reload(null, true); - } - } else { - - //エラー表示 - $this->ERROR = $error; - $this->QUESTION_ID = $_REQUEST['question_id']; - $this->ERROR_COLOR = $this->lfGetErrColor($error, ERR_COLOR); - } - - // 削除ボタン押下時 - } elseif ( ( $_GET['mode'] == 'delete' ) && ( SC_Utils_Ex::sfCheckNumLength($_GET['question_id']) ) ){ - - $sqlval = array('del_flg' => 1); - $objQuery->update('dtb_question', $sqlval, 'question_id = ?', array( $_GET['question_id'] ) ); - $this->reload(null, true); - - // CSVダウンロードボタン押下時 - } elseif ( ( $_GET['mode'] == 'csv' ) && ( SC_Utils_Ex::sfCheckNumLength($_GET['question_id']) ) ){ - require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_CSV_Ex.php"); - - $objCSV = new SC_Helper_CSV_Ex(); - $head = SC_Utils_Ex::sfGetCSVList($this->arrCVSTITLE); - $sql =<<<__EOS__ - SELECT - dtb_question_result.result_id - ,dtb_question_result.question_id - ,dtb_question_result.create_date - ,dtb_question.question_name - ,dtb_question_result.name01 - ,dtb_question_result.name02 - ,dtb_question_result.kana01 - ,dtb_question_result.kana02 - ,dtb_question_result.zip01 - ,dtb_question_result.zip02 - ,dtb_question_result.pref - ,dtb_question_result.addr01 - ,dtb_question_result.addr02 - ,dtb_question_result.tel01 - ,dtb_question_result.tel02 - ,dtb_question_result.tel03 - ,dtb_question_result.mail01 - ,dtb_question_result.question01 - ,dtb_question_result.question02 - ,dtb_question_result.question03 - ,dtb_question_result.question04 - ,dtb_question_result.question05 - ,dtb_question_result.question06 - FROM dtb_question_result - LEFT JOIN dtb_question - ON dtb_question_result.question_id = dtb_question.question_id - WHERE 0=0 - AND dtb_question_result.del_flg = 0 - AND dtb_question_result.question_id = ? - ORDER BY dtb_question_result.result_id ASC -__EOS__; - - $list_data = $objQuery->getAll($sql, array($_GET['question_id'])); - $data = ""; - for($i = 0; $i < count($list_data); $i++) { - // 各項目をCSV出力用に変換する。 - $data .= $objCSV->lfMakeCSV($list_data[$i]); - } - // CSVを送信する - SC_Utils_Ex::sfCSVDownload($head.$data); - exit; - - // 初回表示 or 編集ボタン押下時 - } else { - if (!isset($_GET['question_id'])) $_GET['question_id'] = ""; - - if ( is_numeric($_GET['question_id']) ){ - - $sql = "SELECT question FROM dtb_question WHERE question_id = ?"; - $result = $objQuery->getOne($sql, array($_GET['question_id'])); - - if ( $result ){ - $_POST = unserialize( $result ); - $this->QUESTION_ID = $_GET['question_id']; - } - } - } - - //各ページ共通 - $this->cnt_question = 6; - $this->arrActive = $arrActive; - $this->arrQuestion = $arrQuestion; - - //----　ページ表示 - $objView->assignobj($this); - $objView->display(MAIN_FRAME); - } - - /** - * デストラクタ. - * - * @return void - */ - function destroy() { - parent::destroy(); - } - - // ------------ エラーチェック処理部 ------------ - - function lfGetErrColor( $arr, $err_color ){ - - foreach ( $arr as $key=>$val ) { - if ( is_string($val) && strlen($val) > 0 ){ - $return[$key] = $err_color; - } elseif ( is_array( $val ) ) { - $return[$key] = $this->lfGetErrColor ( $val, $err_color); - } - } - return $return; - } - - - // ------------ エラーチェック処理部 ------------ - - function lfErrCheck (){ - - $objErr = new SC_CheckError(); - $errMsg = ""; - - $objErr->doFunc( array( "稼働・非稼働", "active" ), array( "SELECT_CHECK" ) ); - - $_POST["title"] = mb_convert_kana( trim ( $_POST["title"] ), "K" ); - $objErr->doFunc( array( "アンケート名", "title" ), array( "EXIST_CHECK" ) ); - - $_POST["contents"] = mb_convert_kana( trim ( $_POST["contents"] ), "K" ); - $objErr->doFunc( array( "アンケート内容" ,"contents", "3000" ), array( "EXIST_CHECK", "MAX_LENGTH_CHECK" ) ); - - - if ( ! $_POST['question'][0]["name"] ){ - $objErr->arrErr['question'][0]["name"] = "１つめの質問名が入力されていません"; - } - - //　チェックボックス、ラジオボタンを選択した場合は最低1つ以上項目を記入させる。 - for( $i = 0; $i < count( $_POST["question"] ); $i++ ) { - - if ( $_POST["question"][$i]["kind"] ) { - if (strlen($_POST["question"][$i]["name"]) == 0) { - $objErr->arrErr["question"][$i]["name"] = "タイトルを入力して下さい。"; - } else if ( mb_strlen($_POST["question"][$i]["name"]) > STEXT_LEN ) { - $objErr->arrErr["question"][$i]["name"] = "タイトルは". STEXT_LEN ."字以内で入力して下さい。"; - } - } - - if( $_POST["question"][$i]["kind"] == 3 || $_POST["question"][$i]["kind"] == 4 ) { - - for( $j = 0; $j < count( $_POST["question"][$i]["option"] ); $j++ ) { - // 同じ回答がないかチェック - if (strlen($_POST["question"][$i]["option"][$j]) > 0) { - $checkArray = $_POST["question"][$i]["option"]; - // 自身の値をunset - unset($checkArray[$j]); - if (in_array($_POST["question"][$i]["option"][$j], $checkArray)) { - $objErr->arrErr["question"][$i]["option"][$j] = "同じ質問に同じ回答は設定出来ません。"; - } - } - } - - if( ( strlen( $_POST["question"][$i] ["option"][0] ) == 0 ) || ( strlen( $_POST["question"][$i] ["option"][0] ) > 0 - && strlen( $_POST["question"][$i] ["option"][1] ) == 0 ) ) $objErr->arrErr["question"][$i]['kind'] = "下記の2つ以上の項目に記入してください。"; - - } - } - - return $this->lfGetArrInput( $objErr->arrErr ); - - } - - - function lfGetArrInput( $arr ){ - // 値が入力された配列のみを返す - - if ( is_array($arr) ){ - foreach ( $arr as $key=>$val ) { - if ( is_string($val) && strlen($val) > 0 ){ - $return[$key] = $val; - } elseif ( is_array( $val ) ) { - $data = $this->lfGetArrInput ( $val ); - if ( $data ){ - $return[$key] = $data; - } - } - } - } - return $return; - } -} -?> Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CampaignPreview.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_CampaignPreview.php (revision 18701) +++ (revision ) @@ -1,95 +1,0 @@ -sendRedirect($this->getLocation(URL_CAMPAIGN_TOP)); - exit; - } - - // statusの判別 - switch($_GET['status']) { - case 'active': - $status = CAMPAIGN_TEMPLATE_ACTIVE; - break; - case 'end': - $status = CAMPAIGN_TEMPLATE_END; - break; - default: - $status = CAMPAIGN_TEMPLATE_ACTIVE; - break; - } - - // ディレクトリ名を取得名 - $directory_name = $objQuery->get("dtb_campaign", "directory_name", "campaign_id = ?", array($_GET['campaign_id'])); - - $template_dir = CAMPAIGN_TEMPLATE_PATH . $directory_name . "/" . $status . "preview.tpl"; - - //----　ページ表示 - $objView->assignobj($this); - $objView->display($template_dir); - } - - /** - * デストラクタ. - * - * @return void - */ - function destroy() { - parent::destroy(); - } -} -?> Index: branches/version-2_5-dev/data/Smarty/templates/default/admin/contents/subnavi.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/admin/contents/subnavi.tpl (revision 18700) +++ branches/version-2_5-dev/data/Smarty/templates/default/admin/contents/subnavi.tpl (revision 18786) @@ -25,6 +25,4 @@ class="on" id="navi-contents-index">新着情報管理 class="on" id="navi-contents-recommend">おすすめ商品管理 - class="on" id="navi-contents-inquiry">アンケート管理 - class="on" id="navi-contents-campaign">キャンペーン管理 class="on" id="navi-contents-file">ファイル管理 class="on" id="navi-contents-csv">CSV出力項目設定 @@ -33,5 +31,4 @@ class="on" id="navi-csv-customer">顧客管理 class="on" id="navi-csv-order">受注管理 - class="on" id="navi-csv-campaign">キャンペーン class="on" id="navi-csv-category">カテゴリ class="on" id="navi-csv-sql">高度な設定