[Svn-src-all:1309] [version-2_5-dev 20198] ・/admin/mail/template.php のリファクタリング
fukuda
admin ＠ mail.ec-cube.net
2011年 2月 19日 (土) 14:52:58 JST
Subversion committed to /home/svn/open 20198
http://svn.ec-cube.net/open_trac/changeset/20198
┌────────────────────────────┐
│更新者 : fukuda │
│更新日時: 2011-02-19 14:52:57 +0900 (土, 19 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
・/admin/mail/template.php のリファクタリング
・「担当者画像」に関係するコードは削除していく
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl
U branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
U branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
U branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php
U branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
U branches/version-2_5-dev/html/install/sql/column_comment.sql
U branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
U branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl 2011-02-19 05:52:57 UTC (rev 20198)
@@ -44,7 +44,7 @@
</tr>
<!--{section name=data loop=$list_data}-->
<tr>
- <td><!--{$list_data[data].disp_date|date_format:'%Y/%m/%d'|h}--></td>
+ <td><!--{$list_data[data].create_date|date_format:'%Y/%m/%d'|h}--></td>
<td class="left"><!--{$list_data[data].subject|h}--></td>
<!--{assign var=type value=$list_data[data].mail_method|h}-->
<td><!--{$arrMagazineType[$type]}--></td>
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2011-02-19 05:52:57 UTC (rev 20198)
@@ -327,5 +327,33 @@
$objMail->sendMail();
return true;
}
+
+ /**
+ * 保存されているメールテンプレートの取得
+ * @param array $arrParams 特定IDのテンプレートを取り出したい時は$arrParams['template_id']で指定
+ * @return array メールテンプレート情報を格納した配列
+ * @todo 表示順も引数で変更できるように
+ */
+ function sfGetMailTemplate($arrParams = array()){
+ // 初期化
+ $where = '';
+ $arrValues = array();
+ $objQuery =& SC_Query::getSingletonInstance();
+
+ // 条件文
+ $where = 'del_flg = ?';
+ $arrValues[] = 0;
+ //template_id指定時
+ if (isset($arrParams['template_id'])) {
+ $where .= 'AND template_id = ?';
+ $arrValues[] = $arrParams['template_id'];
+ }
+
+ // 表示順
+ $objQuery->setOrder("create_date DESC");
+
+ $arrResults = $objQuery->select('*', 'dtb_mailmaga_template', $where, $arrValues);
+ return $arrResults;
+ }
}
?>
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2011-02-19 05:52:57 UTC (rev 20198)
@@ -317,11 +317,6 @@
$objTemplate->list_data = lfGetHtmlTemplateData($_POST['template_id']);
$objSiteInfo = new SC_SiteInfo();
$objTemplate->arrInfo = $objSiteInfo->data;
- // メール担当写真の表示
- $objUpFile = new SC_UploadFile(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
- $objUpFile->addFile("メール担当写真", 'charge_image', array('jpg'), IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
- $objUpFile->setDBFileList($objTemplate->list_data);
- $objTemplate->arrFile = $objUpFile->getFormFileList(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
$objMakeTemplate = new SC_AdminView();
$objMakeTemplate->assignobj($objTemplate);
$this->list_data["body"] = $objMakeTemplate->fetch("mail/html_template.tpl");
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php 2011-02-19 05:52:57 UTC (rev 20198)
@@ -85,13 +85,6 @@
$result = $objQuery->getAll($sql, array($_REQUEST["id"]));
$this->list_data = $result[0];
- //メール担当写真の表示
- $objUpFile = new SC_UploadFile(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
- $objUpFile->addFile("メール担当写真", 'charge_image', array('jpg'), IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
- $objUpFile->setDBFileList($this->list_data);
- // Form用配列を渡す。
- $this->arrFile = $objUpFile->getFormFileList(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
-
// メイン商品の情報取得
// FIXME SC_Product クラスを使用した実装
$sql = "SELECT name, main_image, point_rate, deliv_fee, price01_min, price01_max, price02_min, price02_max FROM vw_products_allclass AS allcls WHERE product_id = ?";
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php 2011-02-19 05:52:57 UTC (rev 20198)
@@ -69,37 +69,23 @@
* @return void
*/
function action() {
- $objQuery = new SC_Query();
+ $objMailHelper = new SC_Helper_Mail_Ex();
$objSess = new SC_Session();
// 認証可否の判定
SC_Utils_Ex::sfIsSuccess($objSess);
- if (!isset($_GET['id'])) $_GET['id'] = "";
-
switch ($this->getMode()) {
case 'delete':
if ( SC_Utils_Ex::sfCheckNumLength($_GET['id'])===true ){
- // メール担当の画像があれば削除しておく
- $sql = "SELECT charge_image FROM dtb_mailmaga_template WHERE template_id = ?";
- $result = $objQuery->getOne($sql, array($_GET["id"]));
- if (strlen($result) > 0) {
- @unlink(IMAGE_SAVE_REALDIR. $result);
- }
-
- // 登録削除
- $sql = "UPDATE dtb_mailmaga_template SET del_flg = 1 WHERE template_id = ?";
- $objQuery->query($sql, array($_GET['id']));
-
+ $this->lfDeleteMailTemplate($_GET['id']);
$this->objDisplay->reload(null, true);
}
break;
default:
break;
}
-
- $sql = "SELECT *, create_date as disp_date FROM dtb_mailmaga_template WHERE del_flg = 0 ORDER BY create_date DESC";
- $this->list_data = $objQuery->getAll($sql);
+ $this->list_data = $objMailHelper->sfGetMailTemplate();
}
/**
@@ -110,5 +96,18 @@
function destroy() {
parent::destroy();
}
+
+ /**
+ * メールテンプレートの削除
+ * @param integer 削除したいテンプレートのID
+ * @return void
+ */
+ function lfDeleteMailTemplate($template_id){
+ $objQuery =& SC_Query::getSingletonInstance();
+ $sqlval["del_flg"] = "1";
+ $arrValIn[] = $template_id;
+ $objQuery->update("dtb_mailmaga_template", $sqlval, "template_id = ?", $arrValIn);
+ }
+
}
?>
変更: branches/version-2_5-dev/html/install/sql/column_comment.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/column_comment.sql 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/html/install/sql/column_comment.sql 2011-02-19 05:52:57 UTC (rev 20198)
@@ -99,7 +99,6 @@
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (99, 'dtb_mailmaga_template', 'template_id', 'テンプレートID');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (414, 'dtb_order', 'deliv_pref', '都道府県');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (100, 'dtb_mailmaga_template', 'subject', '件名');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (101, 'dtb_mailmaga_template', 'charge_image', 'メール担当写真');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (102, 'dtb_mailmaga_template', 'mail_method', '1:テキストメール 2:HTMLメール 3:HTMLTEMPLATE');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (103, 'dtb_mailmaga_template', 'header', 'ヘッダーテキスト');
INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (104, 'dtb_mailmaga_template', 'body', '本文（テキスト登録用）');
変更: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-19 05:52:57 UTC (rev 20198)
@@ -238,7 +238,6 @@
CREATE TABLE dtb_mailmaga_template (
template_id int NOT NULL,
subject text,
- charge_image text,
mail_method int,
header text,
body text,
変更: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-18 11:39:02 UTC (rev 20197)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-19 05:52:57 UTC (rev 20198)
@@ -238,7 +238,6 @@
CREATE TABLE dtb_mailmaga_template (
template_id int NOT NULL,
subject text,
- charge_image text,
mail_method int,
header text,
body text,
Svn-src-all メーリングリストの案内