[Svn-src-all:1314] [version-2_5-dev 20203] ・SC_Helper_Mail::sfGetMailTemplateの引数を簡潔に
fukuda
admin ＠ mail.ec-cube.net
2011年 2月 19日 (土) 18:38:11 JST
Subversion committed to /home/svn/open 20203
http://svn.ec-cube.net/open_trac/changeset/20203
┌────────────────────────────┐
│更新者 : fukuda │
│更新日時: 2011-02-19 18:38:11 +0900 (土, 19 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
・SC_Helper_Mail::sfGetMailTemplateの引数を簡潔に
・SC_Utils_Ex::sfCheckNumLength()をSC_Utils_Ex::sfIsInt()に統合
・ガイドラインに合わない $this->list_data を修正
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/basis/LC_Page_Admin_Basis_Mail.php
U branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.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_History.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/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
U branches/version-2_5-dev/data/class/util/SC_Utils.php
変更: 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-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl 2011-02-19 09:38:11 UTC (rev 20203)
@@ -25,7 +25,7 @@
<div class="btn">
<a class="btn-action" href="./template_input.php"><span class="btn-next">テンプレートを新規入力</span></a>
</div>
-<!--{if count($list_data) > 0}-->
+<!--{if count($arrTemplates) > 0}-->
<div id="mail" class="contents-main">
<table class="list center">
<colgroup width="15%">
@@ -42,15 +42,15 @@
<th>削除</th>
<th>プレビュー</th>
</tr>
- <!--{section name=data loop=$list_data}-->
+ <!--{section name=data loop=$arrTemplates}-->
<tr>
- <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><!--{$arrTemplates[data].create_date|date_format:'%Y/%m/%d'|h}--></td>
+ <td class="left"><!--{$arrTemplates[data].subject|h}--></td>
+ <!--{assign var=type value=$arrTemplates[data].mail_method|h}-->
<td><!--{$arrMagazineType[$type]}--></td>
- <td><!--{if $list_data[data].mail_method eq 3}--><a href="./htmlmail.php?mode=edit&template_id=<!--{$list_data[data].template_id}-->"><!--{else}--><a href="./template_input.php?mode=edit&template_id=<!--{$list_data[data].template_id}-->"><!--{/if}-->編集</a></td>
- <td><a href="#" onclick="fnDelete('?mode=delete&id=<!--{$list_data[data].template_id}-->'); return false;">削除</a></td>
- <td><!--{if $list_data[data].mail_method eq 3}--><a href="#" onclick="win03('./preview.php?method=template&id=<!--{$list_data[data].template_id}-->','preview','650','700'); return false;" target="_blank"><!--{else}--><a href="#" onclick="win03('./preview.php?id=<!--{$list_data[data].template_id}-->','preview','650','700'); return false;" target="_blank"><!--{/if}-->プレビュー</a></td>
+ <td><!--{if $arrTemplates[data].mail_method eq 3}--><a href="./htmlmail.php?mode=edit&template_id=<!--{$arrTemplates[data].template_id}-->"><!--{else}--><a href="./template_input.php?mode=edit&template_id=<!--{$arrTemplates[data].template_id}-->"><!--{/if}-->編集</a></td>
+ <td><a href="#" onclick="fnDelete('?mode=delete&id=<!--{$arrTemplates[data].template_id}-->'); return false;">削除</a></td>
+ <td><!--{if $arrTemplates[data].mail_method eq 3}--><a href="#" onclick="win03('./preview.php?method=template&id=<!--{$arrTemplates[data].template_id}-->','preview','650','700'); return false;" target="_blank"><!--{else}--><a href="#" onclick="win03('./preview.php?id=<!--{$arrTemplates[data].template_id}-->','preview','650','700'); return false;" target="_blank"><!--{/if}-->プレビュー</a></td>
</tr>
<!--{/section}-->
</table>
変更: 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-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -330,23 +330,22 @@
/**
* 保存されているメールテンプレートの取得
- * @param array $arrParams 特定IDのテンプレートを取り出したい時は$arrParams['template_id']で指定
+ * @param integer 特定IDのテンプレートを取り出したい時はtemplate_idを指定。未指定時は全件取得
* @return array メールテンプレート情報を格納した配列
* @todo 表示順も引数で変更できるように
*/
- function sfGetMailTemplate($arrParams = array()){
+ function sfGetMailTemplate($template_id = null){
// 初期化
$where = '';
- $arrValues = array();
$objQuery =& SC_Query::getSingletonInstance();
// 条件文
$where = 'del_flg = ?';
$arrValues[] = 0;
//template_id指定時
- if (isset($arrParams['template_id'])) {
+ if (SC_Utils_Ex::sfIsInt($template_id) === true) {
$where .= 'AND template_id = ?';
- $arrValues[] = $arrParams['template_id'];
+ $arrValues[] = $template_id;
}
// 表示順
変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php 2011-02-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Mail.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -79,7 +79,7 @@
case 'id_set':
// テンプレートプルダウン変更時
- if ( SC_Utils_Ex::sfCheckNumLength( $_POST['template_id']) ){
+ if ( SC_Utils_Ex::sfIsInt( $_POST['template_id']) ){
$result = $this->lfGetMailTemplateByTemplateID($_POST['template_id']);
if ( $result ){
$this->arrForm = $result[0];
@@ -89,7 +89,7 @@
}
break;
case 'regist':
- if (SC_Utils_Ex::sfCheckNumLength( $_POST['template_id']) ){
+ if (SC_Utils_Ex::sfIsInt( $_POST['template_id']) ){
// POSTデータの引き継ぎ
$this->arrForm = $this->lfConvertParam($_POST);
変更: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 2011-02-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -115,7 +115,7 @@
}
// カテゴリID取得 無いときはトップページ
- if ( SC_Utils_Ex::sfCheckNumLength($_POST['category_id']) ){
+ if ( SC_Utils_Ex::sfIsInt($_POST['category_id']) ){
$this->category_id = $_POST['category_id'];
} else {
$this->category_id = 0;
変更: 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-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -172,7 +172,7 @@
/*
query:配信履歴「確認」
*/
- if (SC_Utils_Ex::sfCheckNumLength($_GET["send_id"])) {
+ if (SC_Utils_Ex::sfIsInt($_GET["send_id"])) {
// 送信履歴より、送信条件確認画面
$sql = "SELECT search_data FROM dtb_send_history WHERE send_id = ?";
$result = $objQuery->getOne($sql, array($_GET["send_id"]));
@@ -674,7 +674,7 @@
/* テンプレートIDからテンプレートデータを取得 */
function getTemplateData(&$objQuery, $id){
- if ( SC_Utils_Ex::sfCheckNumLength($id) ){
+ if ( SC_Utils_Ex::sfIsInt($id) ){
$sql = "SELECT * FROM dtb_mailmaga_template WHERE template_id = ? ORDER BY template_id DESC";
$result = $objQuery->getAll( $sql, array($id) );
if ( is_array($result) ) {
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php 2011-02-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -81,7 +81,7 @@
switch ($this->getMode()) {
case 'delete':
// 削除時
- if (SC_Utils_Ex::sfCheckNumLength($_GET['send_id'])) {
+ if (SC_Utils_Ex::sfIsInt($_GET['send_id'])) {
$sql = "UPDATE dtb_send_history SET del_flg = 1 WHERE send_id = ?";
$objQuery->query($sql, array($_GET['send_id']) );
$_SERVER['QUERY_STRING'] = "";
変更: 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-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -69,55 +69,9 @@
// 認証可否の判定
SC_Utils_Ex::sfIsSuccess($objSess);
- if (!isset($_POST['body'])) $_POST['body'] = "";
- if (!isset($_REQUEST['method'])) $_REQUEST['method'] = "";
- if (!isset($_REQUEST['id'])) $_REQUEST['id'] = "";
- if (!isset($_GET['send_id'])) $_GET['send_id'] = "";
-
- if ( $_POST['body'] ){
- $this->body = $_POST['body'];
-
- // HTMLメールテンプレートのプレビュー
- } elseif ($_REQUEST["method"] == "template"
- && SC_Utils_Ex::sfCheckNumLength($_REQUEST['id'])) {
-
- $sql = "SELECT * FROM dtb_mailmaga_template WHERE template_id = ?";
- $result = $objQuery->getAll($sql, array($_REQUEST["id"]));
- $this->list_data = $result[0];
-
- // メイン商品の情報取得
- // 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 = ?";
- $main = $objQuery->getAll($sql, array($this->list_data["main_product_id"]));
- $this->list_data["main"] = $main[0];
-
- // サブ商品の情報取得
- // FIXME SC_Product クラスを使用した実装
- $sql = "SELECT product_id, name, main_list_image, price01_min, price01_max, price02_min, price02_max FROM vw_products_allclass WHERE product_id = ?";
- $k = 0;
- $l = 0;
- for ($i = 1; $i <= 12; $i ++) {
- if ($l == 4) {
- $l = 0;
- $k ++;
- }
- $result = "";
- $j = sprintf("%02d", $i);
- if ($i > 0 && $i < 5 ) $k = 0;
- if ($i > 4 && $i < 9 ) $k = 1;
- if ($i > 8 && $i < 13 ) $k = 2;
-
- if (is_numeric($this->list_data["sub_product_id" .$j])) {
- $result = $objQuery->getAll($sql, array($this->list_data["sub_product_id" .$j]));
- $this->list_data["sub"][$k][$l] = $result[0];
- $this->list_data["sub"][$k]["data_exists"] = "OK"; //当該段にデータが１つ以上存在するフラグ
- }
- $l ++;
- }
- $this->tpl_mainpage = 'mail/html_template.tpl';
-
- } elseif (SC_Utils_Ex::sfCheckNumLength($_GET['send_id'])
- || SC_Utils_Ex::sfCheckNumLength($_GET['id'])){
+ if (SC_Utils_Ex::sfIsInt($_GET['send_id'])
+ || SC_Utils_Ex::sfIsInt($_GET['id'])){
+
if (is_numeric($_GET["send_id"])) {
$id = $_GET["send_id"];
$sql = "SELECT body, mail_method FROM dtb_send_history WHERE send_id = ?";
@@ -131,7 +85,7 @@
if ( $result[0]["mail_method"] == 2 ){
// テキスト形式の時はタグ文字をエスケープ
$this->escape_flag = 1;
- }
+ }
$this->body = $result[0]["body"];
}
}
変更: 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-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -77,7 +77,7 @@
switch ($this->getMode()) {
case 'delete':
- if ( SC_Utils_Ex::sfCheckNumLength($_GET['id'])===true ){
+ if ( SC_Utils_Ex::sfIsInt($_GET['id'])===true ){
$this->lfDeleteMailTemplate($_GET['id']);
$this->objDisplay->reload(null, true);
}
@@ -85,7 +85,7 @@
default:
break;
}
- $this->list_data = $objMailHelper->sfGetMailTemplate();
+ $this->arrTemplates = $objMailHelper->sfGetMailTemplate();
}
/**
@@ -104,9 +104,10 @@
*/
function lfDeleteMailTemplate($template_id){
$objQuery =& SC_Query::getSingletonInstance();
- $sqlval["del_flg"] = "1";
- $arrValIn[] = $template_id;
- $objQuery->update("dtb_mailmaga_template", $sqlval, "template_id = ?", $arrValIn);
+ $objQuery->update("dtb_mailmaga_template",
+ array('del_flg' =>1),
+ "template_id = ?",
+ array($template_id));
}
}
変更: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php 2011-02-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -90,7 +90,7 @@
switch ($this->getMode()) {
case 'edit':
// モードによる処理分岐
- if ( SC_Utils_Ex::sfCheckNumLength($_GET['template_id'])===true ){
+ if ( SC_Utils_Ex::sfIsInt($_GET['template_id'])===true ){
// 編集
$sql = "SELECT * FROM dtb_mailmaga_template WHERE template_id = ? AND del_flg = 0";
$result = $objQuery->getAll($sql, array($_GET['template_id']));
変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-19 09:29:53 UTC (rev 20202)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php 2011-02-19 09:38:11 UTC (rev 20203)
@@ -670,21 +670,6 @@
return 'style="background-color:'.ERR_COLOR.'"';
}
- /* DBに渡す数値のチェック
- * 10桁以上はオーバーフローエラーを起こすので。
- */
- function sfCheckNumLength( $value ){
- if ( ! is_numeric($value) ){
- return false;
- }
-
- if ( strlen($value) > 9 ) {
- return false;
- }
-
- return true;
- }
-
// 一致した値のキー名を取得
function sfSearchKey($array, $word, $default) {
foreach($array as $key => $val) {
Svn-src-all メーリングリストの案内