[Svn-src-all:1451] [version-2_5-dev 20343] #963 [管理画面]メルマガ管理リファクタリング あとメール送信部分だけ？
fukuda
admin ＠ mail.ec-cube.net
2011年 2月 23日 (水) 16:23:40 JST
Subversion committed to /home/svn/open 20343
http://svn.ec-cube.net/open_trac/changeset/20343
┌────────────────────────────┐
│更新者 : fukuda │
│更新日時: 2011-02-23 16:23:39 +0900 (水, 23 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#963 [管理画面]メルマガ管理リファクタリング あとメール送信部分だけ？
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl
D branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl
U branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl
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
D branches/version-2_5-dev/html/admin/mail/sendmail.php
U branches/version-2_5-dev/html/install/sql/insert_data.sql
変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl 2011-02-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl 2011-02-23 07:23:39 UTC (rev 20343)
@@ -22,62 +22,48 @@
*/
*}-->
<form name="form1" id="form1" method="post" action="?">
-<!--{foreach key=key item=val from=$arrHidden}-->
-<input type="hidden" name="<!--{$key}-->" value="<!--{$val|h}-->" />
+<!--{foreach key=key item=item from=$arrHidden}-->
+ <!--{if is_array($item)}-->
+ <!--{foreach item=c_item from=$item}-->
+ <input type="hidden" name="<!--{$key}-->[]" value="<!--{$c_item|h}-->" />
+ <!--{/foreach}-->
+ <!--{else}-->
+ <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
+ <!--{/if}-->
<!--{/foreach}-->
+<input type="hidden" name="mode" value="template" />
+<input type="hidden" name="mail_method" value="<!--{$arrForm.mail_method.value}-->" />
<div id="mail" class="contents-main">
<table class="form">
<tr>
<th>テンプレート選択<span class="attention"> *</span></th>
<td>
- <!--{if $arrErr.template_id}--><span class="attention"><!--{$arrErr.template_id}--></span><!--{/if}-->
- <select name="template_id" onchange="return fnInsertValAndSubmit( document.form1, 'mode', 'template', '' ) " style="<!--{$arrErr.template_id|sfGetErrorColor}-->">
+ <!--{assign var=key value="template_id"}-->
+ <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+ <select name="<!--{$key}-->" onchange="return fnInsertValAndSubmit( document.form1, 'mode', 'template', '' ) " style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
<option value="" selected="selected">選択してください</option>
- <!--{html_options options=$arrTemplate selected=$list_data.template_id}-->
+ <!--{html_options options=$arrTemplate selected=$arrForm[$key].value}-->
</select>
</td>
</tr>
-
- <!--{* バッチモードの場合のみ表示 *}-->
- <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
- <tr>
- <th>配信時間設定<span class="attention"> *</span></th>
- <td>
- <!--{if $arrErr.send_year || $arrErr.send_month || $arrErr.send_day || $arrErr.send_hour || $arrErr.send_minutes}--><span class="attention"><!--{$arrErr.send_year}--><!--{$arrErr.send_month}--><!--{$arrErr.send_day}--><!--{$arrErr.send_hour}--><!--{$arrErr.send_minutes}--></span><br /><!--{/if}-->
- <select name="send_year" style="<!--{$arrErr.send_year|sfGetErrorColor}-->">
- <!--{html_options options=$arrYear selected=$arrNowDate.year}-->
- </select>年
- <select name="send_month" style="<!--{$arrErr.send_month|sfGetErrorColor}-->">
- <!--{html_options options=$objDate->getMonth() selected=$arrNowDate.month}-->
- </select>月
- <select name="send_day" style="<!--{$arrErr.send_day|sfGetErrorColor}-->">
- <!--{html_options options=$objDate->getDay() selected=$arrNowDate.day}-->
- </select>日
- <select name="send_hour" style="<!--{$arrErr.send_hour|sfGetErrorColor}-->">
- <!--{html_options options=$objDate->getHour() selected=$arrNowDate.hour}-->
- </select>時
- <select name="send_minutes" style="<!--{$arrErr.send_minutes|sfGetErrorColor}-->">
- <!--{html_options options=$objDate->getMinutesInterval() selected=$arrNowDate.minutes}-->
- </select>分
- </td>
- </tr>
- <!--{/if}-->
</table>
- <!--{if $list_data.template_id}-->
+ <!--{if $arrForm.template_id.value}-->
<table class="form">
<tr>
<th>Subject<span class="attention"> *</span></th>
<td>
- <!--{if $arrErr.subject}--><span class="attention"><!--{$arrErr.subject}--></span><!--{/if}-->
- <input type="text" name="subject" size="65" class="box65" <!--{if $arrErr.subject}--><!--{sfSetErrorStyle}--><!--{/if}--> value="<!--{$list_data.subject|h}-->" />
+ <!--{assign var=key value="subject"}-->
+ <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+ <input type="text" name="subject" size="65" class="box65" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value|h}-->" />
</td>
</tr>
<tr>
<th>本文<span class="attention"> *</span><br />（名前差し込み時は {name} といれてください）</th>
<td>
- <!--{if $arrErr.body}--><span class="attention"><!--{$arrErr.body}--></span><!--{/if}-->
- <textarea name="body" cols="90" rows="40" class="area90" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$list_data.body|h}--></textarea>
+ <!--{assign var=key value="body"}-->
+ <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+ <textarea name="body" cols="90" rows="40" class="area90" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{$arrForm[$key].value|h}--></textarea>
</td>
</tr>
</table>
@@ -90,6 +76,4 @@
</ul>
</div>
</div>
-<input type="hidden" name="mode" value="template" />
-<input type="hidden" name="mail_method" value="<!--{$list_data.mail_method}-->" />
</form>
削除: branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl 2011-02-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl 2011-02-23 07:23:39 UTC (rev 20343)
@@ -1,56 +0,0 @@
-<!--{*
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-*}-->
-<form name="form1" id="form1" method="post" action="?">
-<!--{foreach key=key item=val from=$arrHidden}-->
-<input type="hidden" name="<!--{$key}-->" value="<!--{$val|h}-->" />
-<!--{/foreach}-->
-<input type="hidden" name="mode" value="template" />
-<div id="mail" class="contents-main">
- <h2>配信設定：配信内容設定</h2>
- <div class="message">
- メール配信設定が完了しました。指定時刻にメール配信が始まります。<br />
- 配信履歴にて配信履歴がご覧いただけます。<br />
- <a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->">→続けて設定する</a>
- </div>
- <div class="btn-area">
- <ul>
- <li><a class="btn-action" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' ); return false;"><span class="btn-prev">テンプレート設定画面へ戻る</span></a></li>
- <li> <a class="btn-action" href="javascript:;" name="subm03" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;" <!--{$list_data.template_id|sfGetEnabled}-->><span class="btn-next">配信を予約する</span></a></li>
- </ul>
- </div>
-</div>
-</form>
-
-<form name="form2" id="form2" method="post" action="./preview.php" target="_blank">
-<input type="hidden" name="subject" value="<!--{$list_data.subject|h}-->" />
-<input type="hidden" name="body" value="<!--{$list_data.body|h}-->" />
-<div id="mail2" class="contents-main">
- <h2>HTMLメール作成</h2>
- <div class="message">
- メール配信設定が完了しました。指定時刻にメール配信が始まります。<br />
- 配信履歴にて配信履歴がご覧いただけます。<br />
- <a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->">→続けて設定する</a>
- </div>
-</div>
-</form>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl 2011-02-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl 2011-02-23 07:23:39 UTC (rev 20343)
@@ -21,56 +21,53 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
*}-->
+<script type="text/javascript">
+<!--
+function winSubmitMail(URL,formName,Winname,Wwidth,Wheight){
+ var WIN = window.open(URL,Winname,"width="+Wwidth+",height="+Wheight+",scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no");
+ document.forms[formName].target = Winname;
+ document.forms[formName].submit();
+ WIN.focus();
+}
+//-->
+</script>
<form name="form1" id="form1" method="post" action="?">
-<!--{foreach key=key item=val from=$arrHidden}-->
-<input type="hidden" name="<!--{$key}-->" value="<!--{$val|h}-->" />
+<input type="hidden" name="mode" value="template">
+<input type="hidden" name="subject" value="<!--{$arrForm.subject.value|h}-->">
+<input type="hidden" name="body" value="<!--{$arrForm.body.value|h}-->">
+<input type="hidden" name="mail_method" value="<!--{$arrForm.mail_method.value|h}-->">
+<input type="hidden" name="template_id" value="<!--{$arrForm.template_id.value|h}-->">
+<!--{foreach key=key item=item from=$arrHidden}-->
+ <!--{if is_array($item)}-->
+ <!--{foreach item=c_item from=$item}-->
+ <input type="hidden" name="<!--{$key}-->[]" value="<!--{$c_item|h}-->" />
+ <!--{/foreach}-->
+ <!--{else}-->
+ <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
+ <!--{/if}-->
<!--{/foreach}-->
<div id="mail" class="contents-main">
<table class="form">
- <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
<tr>
- <th>配信時間設定<span class="attention"> *</span></th>
- <td>
- <!--{$list_data.send_year}-->年<!--{$list_data.send_month}-->月<!--{$list_data.send_day}-->日
- <!--{$list_data.send_hour}-->時<!--{$list_data.send_minutes}-->分
- </td>
- </tr>
- <!--{/if}-->
- <!--▼インクルードここから-->
- <!--{if $list_data.template_id}-->
- <tr>
<th>Subject<span class="attention"> *</span></th>
- <td><!--{$list_data.subject|h}--></td>
+ <td><!--{$arrForm.subject.value|h}--></td>
</tr>
- <!--{if $list_data.mail_method ne 2}-->
- <tr>
- <td colspan="2"><a href="#" onClick="return document.form2.submit();">HTMLで確認</a></td>
- </tr>
+ <!--{if $arrForm.mail_method.value ne 2}-->
+ <tr>
+ <td colspan="2"><a href="javascript:;" onClick="winSubmitMail('','form2','preview',650,700); return false;">HTMLで確認</a></td>
+ </tr>
<!--{/if}-->
- <!--{if $smarty.post.template_mode ne "html_template"}-->
<tr>
<th>本文<span class="attention"> *</span><br />（名前差し込み時は {name} といれてください）</th>
- <td><!--{$list_data.body|h|nl2br}--></td>
+ <td><!--{$arrForm.body.value|h|nl2br}--></td>
</tr>
- <!--{/if}-->
- <!--{/if}-->
- <!--▲インクルードここまで-->
</table>
<div class="btn-area">
<ul>
<li><a class="btn-action" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' ); return false;"><span class="btn-prev">テンプレート設定画面へ戻る</span></a></li>
- <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
- <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;" <!--{$list_data.template_id|sfGetEnabled}-->><span class="btn-next">配信を予約する</span></a></li>
- <!--{else}-->
- <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;" <!--{$list_data.template_id|sfGetEnabled}-->><span class="btn-next">配信する</span></a></li>
- <!--{/if}-->
+ <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;"><span class="btn-next">配信する</span></a></li>
</ul>
</div>
</div>
-<input type="hidden" name="mode" value="template">
</form>
-<form name="form2" id="form2" method="post" action="./preview.php" target="_blank">
- <input type="hidden" name="subject" value="<!--{$list_data.subject|h}-->" />
- <input type="hidden" name="body" value="<!--{$list_data.body|h}-->" />
-</form>
変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl 2011-02-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl 2011-02-23 07:23:39 UTC (rev 20343)
@@ -30,107 +30,136 @@
</script>
</head>
-
<form name="form1" id="form1" method="post" action="?">
-<input type="hidden" name="mode" value="search" />
<div id="mail" class="contents-main">
<h2>配信条件</h2>
<table class="form">
<tr>
<th>顧客名</th>
- <td><!--{$list_data.name|default:"(未指定)"|h}--></td>
+ <td><!--{$arrSearchData.search_name|default:"(未指定)"|h}--></td>
</tr>
<tr>
<th>顧客名(カナ)</th>
- <td width="249"><!--{$list_data.kana|default:"(未指定)"|h}--></td>
+ <td><!--{$arrSearchData.search_kana|default:"(未指定)"|h}--></td>
</tr>
<tr>
<th>都道府県</th>
- <td><!--{$list_data.pref_disp|default:"(未指定)"}--></td>
+ <td>
+ <!--{assign var=key value="search_pref"}-->
+ <!--{if is_array($arrSearchData[$key])}-->
+ <!--{foreach item=item from=$arrSearchData[$key]}-->
+ <!--{$arrPref[$item]|h}-->
+ <!--{/foreach}-->
+ <!--{else}-->(未指定)<!--{/if}-->
+ </td>
</tr>
<tr>
<th>TEL</th>
- <td width="249"><!--{$list_data.tel|default:"(未指定)"|h}--></td>
+ <td><!--{$arrSearchData.search_tel|default:"(未指定)"|h}--></td>
</tr>
<tr>
<th>性別</th>
- <td><!--{$list_data.sex_disp|default:"(未指定)"}--></td>
+ <td>
+ <!--{assign var=key value="search_sex"}-->
+ <!--{if is_array($arrSearchData[$key])}-->
+ <!--{foreach item=item from=$arrSearchData[$key]}-->
+ <!--{$arrSex[$item]|h}-->
+ <!--{/foreach}-->
+ <!--{else}-->(未指定)<!--{/if}-->
+ </td>
</tr>
<tr>
<th>誕生月</th>
- <td width="249"><!--{if $list_data.birth_month}--><!--{$list_data.birth_month|h}-->月<!--{else}-->(未指定)<!--{/if}--></td>
+ <td><!--{if $arrSearchData.search_birth_month}--><!--{$arrSearchData.search_birth_month|h}-->月<!--{else}-->(未指定)<!--{/if}--></td>
</tr>
<tr>
<th>配信形式</th>
- <td><!--{$list_data.htmlmail_disp|default:"(未指定)"|h}--></td>
+ <td><!--{$arrSearchData.htmlmail_disp|default:"(未指定)"|h}--></td>
</tr>
<tr>
<th>購入回数</th>
<td>
- <!--{if $list_data.buy_times_from == null}-->(未指定)<!--{else}--><!--{$list_data.buy_times_from|h}-->回<!--{/if}--> 〜
- <!--{if $list_data.buy_times_to == null}-->(未指定)<!--{else}--><!--{$list_data.buy_times_to|h}-->回<!--{/if}-->
+ <!--{if $arrSearchData.search_buy_times_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_from|h}-->回<!--{/if}--> 〜
+ <!--{if $arrSearchData.search_buy_times_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_to|h}-->回<!--{/if}-->
</td>
</tr>
- <!--{*非会員は選択できない
<tr>
- <th>種別</th>
- <td>
- <!--{$list_data.customer|default:"すべて"|h}-->
- </td>
- </tr>
- *}-->
- <tr>
<th>購入商品コード</th>
- <td><!--{$list_data.buy_product_code|default:"(未指定)"|h}--></td>
+ <td><!--{$arrSearchData.search_buy_product_code|default:"(未指定)"|h}--></td>
</tr>
<tr>
<th>購入金額</th>
<td>
- <!--{if $list_data.buy_total_from == null}-->(未指定)<!--{else}--><!--{$list_data.buy_total_from|h}-->円<!--{/if}--> 〜
- <!--{if $list_data.buy_total_to == null}-->(未指定)<!--{else}--><!--{$list_data.buy_total_to|h}-->円<!--{/if}-->
+ <!--{if $arrSearchData.search_buy_total_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_from|h}-->円<!--{/if}--> 〜
+ <!--{if $arrSearchData.search_buy_total_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_to|h}-->円<!--{/if}-->
</td>
</tr>
<tr>
<th>メールアドレス</th>
- <td><!--{$list_data.email|default:"(未指定)"|h}--></td>
+ <td><!--{$arrSearchData.search_email|default:"(未指定)"|h}--></td>
</tr>
<tr>
<th>職業</th>
- <td><!--{$list_data.job_disp|default:"(未指定)"|h}--></td>
+ <td>
+ <!--{assign var=key value="search_job"}-->
+ <!--{if is_array($arrSearchData[$key])}-->
+ <!--{foreach item=item from=$arrSearchData[$key]}-->
+ <!--{$arrJob[$item]|h}-->
+ <!--{/foreach}-->
+ <!--{else}-->(未指定)<!--{/if}-->
+ </td>
</tr>
<tr>
<th>生年月日</th>
<td>
- <!--{if $list_data.b_start_year}-->
- <!--{$list_data.b_start_year}-->年<!--{$list_data.b_start_month}-->月<!--{$list_data.b_start_day}-->日 ? <!--{$list_data.b_end_year}-->年<!--{$list_data.b_end_month}-->月<!--{$list_data.b_end_day}-->日
+ <!--{if $arrSearchData.search_b_start_year}-->
+ <!--{$arrSearchData.search_b_start_year}-->年<!--{$arrSearchData.search_b_start_month}-->月<!--{$arrSearchData.search_b_start_day}-->日 〜
+ <!--{if $arrSearchData.search_b_end_year}--> <!--{$arrSearchData.search_b_end_year}-->年<!--{$arrSearchData.search_b_end_month}-->月<!--{$arrSearchData.search_b_end_day}-->日<!--{/if}-->
<!--{else}-->(未指定)<!--{/if}-->
</td>
</tr>
<tr>
<th>登録日</th>
<td>
- <!--{if $list_data.start_year}-->
- <!--{$list_data.start_year}-->年<!--{$list_data.start_month}-->月<!--{$list_data.start_day}-->日 ? <!--{$list_data.end_year}-->年<!--{$list_data.end_month}-->月<!--{$list_data.end_day}-->日
+ <!--{if $arrSearchData.search_start_year}-->
+ <!--{$arrSearchData.search_start_year}-->年<!--{$arrSearchData.search_start_month}-->月<!--{$arrSearchData.search_start_day}-->日 〜
+ <!--{if $arrSearchData.search_end_year}--> <!--{$arrSearchData.search_end_year}-->年<!--{$arrSearchData.search_end_month}-->月<!--{$arrSearchData.search_end_day}-->日<!--{/if}-->
<!--{else}-->(未指定)<!--{/if}-->
</td>
- </tr>
+ </tr>
<tr>
<th>最終購入日</th>
<td>
- <!--{if $list_data.buy_start_year}-->
- <!--{$list_data.buy_start_year}-->年<!--{$list_data.buy_start_month}-->月<!--{$list_data.buy_start_day}-->日 ? <!--{$list_data.buy_end_year}-->年<!--{$list_data.buy_end_month}-->月<!--{$list_data.buy_end_day}-->日
+ <!--{if $arrSearchData.search_buy_start_year}-->
+ <!--{$arrSearchData.search_buy_start_year}-->年<!--{$arrSearchData.search_buy_start_month}-->月<!--{$arrSearchData.search_buy_start_day}-->日 〜
+ <!--{if $arrSearchData.search_buy_end_year}--> <!--{$arrSearchData.search_buy_end_year}-->年<!--{$arrSearchData.search_buy_end_month}-->月<!--{$arrSearchData.search_buy_end_day}-->日<!--{/if}-->
<!--{else}-->(未指定)<!--{/if}-->
</td>
</tr>
<tr>
<th>購入商品名</th>
- <td><!--{$list_data.buy_product_name|default:"(未指定)"|h}--></td>
+ <td><!--{$arrSearchData.search_buy_product_name|default:"(未指定)"|h}--></td>
</tr>
<tr>
<th>カテゴリ</th>
- <td><!--{$list_data.category_name|default:"(未指定)"|h}--></td>
+ <td>
+ <!--{assign var=key value="search_category_id"}-->
+ <!--{if is_array($arrSearchData[$key])}-->
+ <!--{foreach item=item from=$arrSearchData[$key]}-->
+ <!--{$arrCatList[$item]|h}-->
+ <!--{/foreach}-->
+ <!--{else}-->(未指定)<!--{/if}-->
+ </td>
</tr>
+ <tr>
+ <th>配信形式</th>
+ <td><!--{$arrHtmlmail[$arrSearchData.search_htmlmail]|default:"(未指定)"|h}--></td>
+ </tr>
+ <tr>
+ <th>配信メールアドレス種別</th>
+ <td><!--{$arrMailType[$arrSearchData.search_mail_type]|default:"(未指定)"|h}--></td>
+ </tr>
</table>
<div class="btn-area">
変更: 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-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2011-02-23 07:23:39 UTC (rev 20343)
@@ -70,6 +70,9 @@
$objDb = new SC_Helper_DB_Ex();
$this->arrCatList = $objDb->sfGetCategoryList();
+ // テンプレート一覧設定
+ $this->arrTemplate = $this->lfGetMailTemplateList(SC_Helper_Mail_Ex::sfGetMailTemplate());
+
$this->httpCacheControl('nocache');
}
@@ -89,6 +92,7 @@
* @return void
*/
function action() {
+
// パラメータ管理クラス
$objFormParam = new SC_FormParam();
$this->lfInitParamSearchCustomer($objFormParam);
@@ -96,211 +100,65 @@
// パラメーター読み込み
$this->arrHidden = $objFormParam->getSearchArray();
- $this->arrForm = $objFormParam->getFormParamList();
// 入力パラメーターチェック
- $this->arrErr = $this->lfCheckError($objFormParam);
- if(!SC_Utils_Ex::isBlank($this->arrErr)) {
- return;
- }
-
+ $this->arrErr = SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
+ $this->arrForm = $objFormParam->getFormParamList();
+ if(!SC_Utils_Ex::isBlank($this->arrErr)) return;
+
// モードによる処理切り替え
switch ($this->getMode()) {
+ // 配信先検索
case 'search':
- list($this->tpl_linemax, $this->arrResults, $this->objNavi) = $this->lfDoSearch($objFormParam->getHashArray());
+ case 'back':
+ list($this->tpl_linemax, $this->arrResults, $this->objNavi) = SC_Helper_Customer_Ex::sfGetSearchData($objFormParam->getHashArray());
$this->arrPagenavi = $this->objNavi->arrPagenavi;
break;
- default:
- break;
- }
-
-
- /*
- // ページ初期設定
- $objDate = new SC_Date();
- $objQuery = new SC_Query();
- $objDb = new SC_Helper_DB_Ex();
- $this->objDate = $objDate;
- $this->arrTemplate = $this->getTemplateList($objQuery);
-
- $objSess = new SC_Session();
-
- // 認証可否の判定
- SC_Utils_Ex::sfIsSuccess($objSess);
-
- switch($this->getMode()) {
- case 'query':
- // query:配信履歴「確認」
- 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"]));
- $tpl_path = "mail/query.tpl";
-
- $list_data = unserialize($result);
-
- // 都道府県を変換
- $list_data['pref_disp'] = $this->arrPref[$list_data['pref']];
-
- // 配信形式
- $list_data['htmlmail_disp'] = $this->arrHtmlmail[$list_data['htmlmail']];
-
- // 性別の変換
- if (count($list_data['sex']) > 0) {
- foreach($list_data['sex'] as $key => $val){
- $list_data['sex'][$key] = $this->arrSex[$val];
- $sex_disp .= $list_data['sex'][$key] . " ";
- }
- $list_data['sex_disp'] = $sex_disp;
- }
-
- // 職業の変換
- if (count($list_data['job']) > 0) {
- foreach($list_data['job'] as $key => $val){
- $list_data['job'][$key] = $this->arrJob[$val];
- $job_disp .= $list_data['job'][$key] . " ";
- }
- $list_data['job_disp'] = $job_disp;
- }
-
- // カテゴリ変換
- $arrCatList = $objDb->sfGetCategoryList();
- $list_data['category_name'] = $arrCatList[$list_data['category_id']];
-
- $this->list_data = $list_data;
- $this->setTemplate('mail/query.tpl');
- return;
- }
- break;
- //search:「検索」ボタン
- //back:検索結果画面「戻る」ボタン
- case 'search':
- case 'back':
- // 入力値コンバート
- $this->list_data = $this->lfConvertParam($_POST, $this->arrSearchColumn);
-
- // 入力エラーのチェック
- $this->arrErr = $this->lfErrorCheck($this->list_data);
-
- // 検索開始
- if (empty($this->arrErr)) {
- $this->list_data['name'] = isset($this->list_data['name'])
- ? $this->list_data['name'] : "";
- // hidden要素作成
- $this->arrHidden = $this->lfGetHidden($this->list_data);
-
- // 検索データ取得
- $objSelect = new SC_CustomerList($this->list_data, "magazine");
- // 生成されたWHERE文を取得する
- list($where, $arrval) = $objSelect->getWhere();
-
- // 「WHERE」部分を削除する。
- $where = ereg_replace("^WHERE", "", $where);
-
- // 検索結果の取得
- $from = "dtb_customer";
-
- // 行数の取得
- $linemax = $objQuery->count($from, $where, $arrval);
- $this->tpl_linemax = $linemax; // 何件が該当しました。表示用
-
- // ページ送りの取得
- $objNavi = new SC_PageNavi($this->tpl_pageno, $linemax, SEARCH_PMAX, "fnResultPageNavi", NAVI_PMAX);
- $this->arrPagenavi = $objNavi->arrPagenavi;
- $startno = $objNavi->start_row;
-
- // 取得範囲の指定(開始行番号、行数のセット)
- $objQuery->setLimitOffset(SEARCH_PMAX, $startno);
- // 表示順序
- $objQuery->setOrder("customer_id DESC");
-
- // 検索結果の取得
- $col = $objSelect->getMailMagazineColumn($this->lfGetIsMobile($_POST['mail_type']));
- $this->arrResults = $objQuery->select($col, $from, $where, $arrval);
- // 現在時刻の取得
- $this->arrNowDate = $this->lfGetNowDate();
- }
- break;
- // input:検索結果画面「htmlmail内容設定」ボタン
+ // input:検索結果画面「配信内容を設定する」押下後
case 'input':
- // 入力値コンバート
- $this->list_data = $this->lfConvertParam($_POST, $this->arrSearchColumn);
- // 入力エラーのチェック
- $this->arrErr = $this->lfErrorCheck($this->list_data);
- // エラーなし
- if (empty($this->arrErr)) {
- // 現在時刻の取得
- $this->arrNowDate = $this->lfGetNowDate();
- $this->arrHidden = $this->lfGetHidden($this->list_data); // hidden要素作成
- $this->tpl_mainpage = 'mail/input.tpl';
- }
+ $this->tpl_mainpage = 'mail/input.tpl';
break;
- // template:テンプレート選択
+ // template:テンプレート選択時
case 'template':
- // 入力値コンバート
- $this->list_data = $this->lfConvertParam($_POST, $this->arrSearchColumn);
-
- // 時刻設定の取得
- $this->arrNowDate['year'] = isset($_POST['send_year']) ? $_POST['send_year'] : "";
- $this->arrNowDate['month'] = isset($_POST['send_month']) ? $_POST['send_month'] : "";
- $this->arrNowDate['day'] = isset($_POST['send_day']) ? $_POST['send_day'] : "";
- $this->arrNowDate['hour'] = isset($_POST['send_hour']) ? $_POST['send_hour'] : "";
- $this->arrNowDate['minutes'] = isset($_POST['send_minutes']) ? $_POST['send_minutes'] : "";
-
- // 入力エラーのチェック
- $this->arrErr = $this->lfErrorCheck($this->list_data);
-
- // 検索開始
- if (empty($this->arrErr)) {
- $this->list_data['name'] = isset($this->list_data['name']) ? $this->list_data['name'] : "";
- $this->arrHidden = $this->lfGetHidden($this->list_data); // hidden要素作成
-
- $this->tpl_mainpage = 'mail/input.tpl';
- $template_data = $this->getTemplateData($objQuery, $_POST['template_id']);
- if ( $template_data ){
- foreach( $template_data as $key=>$val ){
- $this->list_data[$key] = $val;
- }
- }
-
+ case 'regist_back':
+ $this->tpl_mainpage = 'mail/input.tpl';
+ if (SC_Utils_Ex::sfIsInt($_POST['template_id']) === true) {
+ $this->lfAddParamSelectTemplate($objFormParam);
+ $this->lfGetTemplateData($objFormParam, $_POST['template_id']);
+ // regist_back時、subject,bodyにはテンプレートを読み込むのではなく、入力内容で上書き
+ if($this->getMode()=='regist_back') $objFormParam->setParam($_POST);
}
break;
- // regist_confirm:「入力内容を確認」
- // regist_back:「テンプレート設定画面へ戻る」
- // regist_complete:「登録」
case 'regist_confirm':
- case 'regist_back':
+ $this->tpl_mainpage = 'mail/input.tpl';
+ $this->lfAddParamSelectTemplate($objFormParam);
+ $objFormParam->setParam($_POST);
+ $this->arrErr = $objFormParam->checkError();
+ if (SC_Utils_Ex::isBlank($this->arrErr)) $this->tpl_mainpage = 'mail/input_confirm.tpl';
+ break;
case 'regist_complete':
- // 入力値コンバート
- $this->arrCheckColumn = array_merge( $this->arrSearchColumn, $this->arrRegistColumn );
- $this->list_data = $this->lfConvertParam($_POST, $this->arrCheckColumn);
-
- // 現在時刻の取得
- $this->arrNowDate = $this->lfGetNowDate();
-
- // 入力エラーのチェック
- $this->arrErr = $this->lfErrorCheck($this->list_data, 1);
$this->tpl_mainpage = 'mail/input.tpl';
- $this->arrHidden = $this->lfGetHidden($this->list_data); // hidden要素作成
-
- // 検索開始
- if (empty($this->arrErr)) {
- $this->list_data['name'] =
- isset($this->list_data['name'])
- ? $this->list_data['name'] : "";
- //TODO 要リファクタリング(MODE if利用)
- if ( $this->getMode() == 'regist_confirm'){
- $this->tpl_mainpage = 'mail/input_confirm.tpl';
- } else if( $this->getMode() == 'regist_complete' ){
- $sendId = $this->lfRegistData($objQuery, $this->list_data);
- SC_Response_Ex::sendRedirectFromUrlPath(ADMIN_DIR . 'mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId));
- exit;
- }
+ $this->lfAddParamSelectTemplate($objFormParam);
+ $objFormParam->setParam($_POST);
+ $this->arrErr = $objFormParam->checkError();
+ if (SC_Utils_Ex::isBlank($this->arrErr)){
+ $this->lfRegisterData($objFormParam);
+ $this->tpl_mainpage = 'mail/index.tpl';
+ //SC_Helper_Mail_Ex::hogehoge(); //送信処理
+ $this->tpl_onload = "window.alert('メール送信が完了しました。配信履歴画面から確認してください。');";
}
break;
+ // query:配信履歴「確認」
+ case 'query':
+ if (SC_Utils_Ex::sfIsInt($_GET["send_id"])) {
+ $this->arrSearchData = $this->lfGetMailQuery();
+ }
+ $this->setTemplate('mail/query.tpl');
+ break;
default:
+ break;
}
- */
+ $this->arrForm = $objFormParam->getFormParamList();
}
/**
@@ -313,7 +171,7 @@
}
/**
- * パラメーター情報の初期化
+ * パラメーター情報の初期化（初期顧客検索時）
*
* @param array $objFormParam フォームパラメータークラス
* @return void
@@ -327,205 +185,99 @@
}
/**
- * エラーチェック
+ * パラメーター情報の追加（テンプレート選択）
*
* @param array $objFormParam フォームパラメータークラス
- * @return array エラー配列
+ * @return void
*/
- function lfCheckError(&$objFormParam) {
- return SC_Helper_Customer_Ex::sfCheckErrorSearchParam($objFormParam);
+ function lfAddParamSelectTemplate(&$objFormParam) {
+ $objFormParam->addParam("メール形式", 'mail_method', INT_LEN, "n", array("EXIST_CHECK","ALNUM_CHECK"));
+ $objFormParam->addParam("Subject", 'subject', STEXT_LEN, "KVa", array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("本文", 'body', LLTEXT_LEN, "KVCa", array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK"));
+ $objFormParam->addParam("テンプレートID", "template_id", INT_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"), "", false);
}
/**
- * 顧客一覧を検索する処理
+ * テンプレート一覧情報の取得
*
- * @param array $arrParam 検索パラメーター連想配列
- * @return array( integer 全体件数, mixed 顧客データ一覧配列, mixed SC_PageNaviオブジェクト)
+ * @param array $arrTemplate SC_Helper_Mail_Ex::sfGetMailTemplate()の戻り値
+ * @return array key:template_id value:サブジェクト【配信形式】
*/
- function lfDoSearch($arrParam) {
- return SC_Helper_Customer_Ex::sfGetSearchData($arrParam);
- }
-
- // 現在時刻の取得（配信時間デフォルト値）
- function lfGetNowDate(){
- $nowdate = date("Y/n/j/G/i");
- list($year, $month, $day, $hour, $minute) = split("[/]", $nowdate);
- $arrNowDate = array( 'year' => $year, 'month' => $month, 'day' => $day, 'hour' => $hour, 'minutes' => $minute);
- foreach ($arrNowDate as $key => $val){
- switch ($key){
- case 'minutes':
- $val = ereg_replace('^[0]','', $val);
- if ($val < 30){
- $list_date[$key] = '30';
- }else{
- $list_date[$key] = '00';
- }
- break;
- case 'year':
- case 'month':
- case 'day':
- $list_date[$key] = $val;
- break;
+ function lfGetMailTemplateList($arrTemplate){
+ if ( is_array($arrTemplate) ){
+ foreach( $arrTemplate as $line ){
+ $return[$line['template_id']] = "【" . $this->arrHtmlmail[$line['mail_method']] . "】" . $line['subject'];
}
}
- if ($arrNowDate['minutes'] < 30){
- $list_date['hour'] = $hour;
- }else{
- $list_date['hour'] = $hour + 1;
- }
- return $list_date;
+ return $return;
}
-
+
/**
+ * テンプレートIDから情報の取得して$objFormParamにset_paramする
+ *
+ * @param array $objFormParam フォームパラメータークラス
+ * @param array $template_id テンプレートID
+ * @return void
+ */
+ function lfGetTemplateData(&$objFormParam, $template_id){
+ $objQuery =& SC_Query::getSingletonInstance();
+ $objQuery->setOrder("template_id DESC");
+ $where = 'template_id = ?';
+ $arrResults = $objQuery->getRow('*', 'dtb_mailmaga_template', $where, array($template_id));
+ $objFormParam->setParam($arrResults);
+ }
+
+ /**
* 配信内容と配信リストを書き込む
*
* @return string 登録した行の dtb_send_history.send_id の値
*/
- function lfRegistData(&$objQuery, $arrData){
+ function lfRegisterData(&$objFormParam){
+ $objQuery =& SC_Query::getSingletonInstance();
+
+ list($linemax, $arrSendCustomer, $objNavi) = SC_Helper_Customer_Ex::sfGetSearchData($objFormParam->getHashArray());
+ $send_customer_cnt = count($arrSendCustomer);
- $objSelect = new SC_CustomerList($this->lfConvertParam($arrData, $this->arrSearchColumn), "magazine" );
-
- $search_data = $objQuery->getAll($objSelect->getListMailMagazine($this->lfGetIsMobile($_POST['mail_type'])), $objSelect->arrVal);
- $dataCnt = count($search_data);
-
+ $send_id = $objQuery->nextVal('dtb_send_history_send_id');
$dtb_send_history = array();
- $dtb_send_history["mail_method"] = $arrData['mail_method'];
- $dtb_send_history["subject"] = $arrData['subject'];
- $dtb_send_history["body"] = $arrData['body'];
- if(MELMAGA_BATCH_MODE) {
- $dtb_send_history["start_date"] = $arrData['send_year'] ."/".$arrData['send_month']."/".$arrData['send_day']." ".$arrData['send_hour'].":".$arrData['send_minutes'];
- } else {
- $dtb_send_history["start_date"] = "now()";
- }
+ $dtb_send_history["mail_method"] = $objFormParam->getValue('mail_method');
+ $dtb_send_history["subject"] = $objFormParam->getValue('subject');
+ $dtb_send_history["body"] = $objFormParam->getValue('body');
+ $dtb_send_history["start_date"] = "now()";
$dtb_send_history["creator_id"] = $_SESSION['member_id'];
- $dtb_send_history["send_count"] = $dataCnt;
- $arrData['body'] = "";
- $dtb_send_history["search_data"] = serialize($arrData);
+ $dtb_send_history["send_count"] = $send_customer_cnt;
+ $dtb_send_history["search_data"] = serialize($objFormParam->getSearchArray());
$dtb_send_history["update_date"] = "now()";
$dtb_send_history["create_date"] = "now()";
- $dtb_send_history['send_id'] = $objQuery->nextVal('dtb_send_history_send_id');
+ $dtb_send_history['send_id'] = $send_id;
$objQuery->insert("dtb_send_history", $dtb_send_history );
- $sendId = $objQuery->currval('dtb_send_history_send_id');
-
- if ( is_array( $search_data ) ){
- foreach( $search_data as $line ){
+ if ( is_array( $arrSendCustomer ) ){
+ foreach( $arrSendCustomer as $line ){
$dtb_send_customer = array();
$dtb_send_customer["customer_id"] = $line["customer_id"];
- $dtb_send_customer["send_id"] = $sendId;
+ $dtb_send_customer["send_id"] = $send_id;
$dtb_send_customer["email"] = $line["email"];
$dtb_send_customer["name"] = $line["name01"] . " " . $line["name02"];
$objQuery->insert("dtb_send_customer", $dtb_send_customer );
}
}
-
- return $sendId;
}
-
- function lfGetIsMobile($mail_type) {
- // 検索結果の取得
- $is_mobile = false;
- switch($mail_type) {
- case 1:
- $is_mobile = false;
- break;
- case 2:
- $is_mobile = true;
- break;
- default:
- $is_mobile = false;
- break;
- }
-
- return $is_mobile;
+
+ /**
+ * 配信履歴から条件を取得する
+ *
+ * @param integer $send_id 配信履歴番号
+ * @return array
+ */
+ function lfGetMailQuery($send_id){
+
+ $objQuery =& SC_Query::getSingletonInstance();
+
+ // 送信履歴より、送信条件確認画面
+ $sql = "SELECT search_data FROM dtb_send_history WHERE send_id = ?";
+ $searchData = $objQuery->getOne($sql, array($_GET["send_id"]));
+ return unserialize($searchData);
}
-
- // hidden要素出力用配列の作成
- function lfGetHidden( $array ){
- if ( is_array($array) ){
- foreach( $array as $key => $val ){
- if ( is_array( $val )){
- for ( $i=0; $i<count($val); $i++){
- $return[ $key.'['.$i.']'] = $val[$i];
- }
- } else {
- $return[$key] = $val;
- }
- }
- }
- return $return;
- }
-
- // 取得文字列の変換
- function lfConvertParam($array, $arrSearchColumn) {
-
- // 文字変換
- foreach ($arrSearchColumn as $data) {
- $arrConvList[ $data["column"] ] = $data["convert"];
- }
-
- $new_array = array();
- foreach ($arrConvList as $key => $val) {
- if (isset($array[$key]) && strlen($array[$key]) > 0 ){ // データのあるものだけ返す
- $new_array[$key] = $array[$key];
- if( strlen($val) > 0) {
- $new_array[$key] = mb_convert_kana($new_array[$key] ,$val);
- }
- }
- }
- return $new_array;
-
- }
-
-
- // 入力エラーチェック
- function lfErrorCheck($array, $flag = '') {
-
- // flag は登録時用
-
- $objErr = new SC_CheckError($array);
-
- if ( $flag ){
- $objErr->doFunc(array("テンプレート", "template_id"), array("EXIST_CHECK", "NUM_CHECK"));
- $objErr->doFunc(array("メール送信法法", "mail_method"), array("EXIST_CHECK", "NUM_CHECK"));
- $objErr->doFunc(array("Subject", "subject", STEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK"));
- $objErr->doFunc(array("本文", 'body', LLTEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK")); // HTMLテンプレートを使用しない場合
- }
-
- return $objErr->arrErr;
- }
-
- /* テンプレートIDとsubjectの配列を返す */
- function getTemplateList(&$objQuery){
- $return = "";
- $sql = "SELECT template_id, subject, mail_method FROM dtb_mailmaga_template WHERE del_flg = 0 ";
- if ($_POST["htmlmail"] == 2 || $_POST['mail_type'] == 2) {
- $sql .= " AND mail_method = 2 "; // TEXT希望者へのTESTメールテンプレートリスト
- }
- $sql .= " ORDER BY template_id DESC";
- $result = $objQuery->getAll($sql);
-
- if ( is_array($result) ){
- foreach( $result as $line ){
- $return[$line['template_id']] = "【" . $this->arrMagazineTypeAll[$line['mail_method']] . "】" . $line['subject'];
- }
- }
-
- return $return;
- }
-
- /* テンプレートIDからテンプレートデータを取得 */
- function getTemplateData(&$objQuery, $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) ) {
- $return = $result[0];
- }
- }
- return $return;
- }
-
}
?>
変更: 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-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php 2011-02-23 07:23:39 UTC (rev 20343)
@@ -69,17 +69,21 @@
case 'template':
if (SC_Utils_Ex::sfIsInt($_GET['template_id'])){
$arrMail = $objMailHelper->sfGetMailTemplate($_GET['template_id']);
+ $this->mail = $arrMail[0];
}
break;
case 'history';
if (SC_Utils_Ex::sfIsInt($_GET['send_id'])){
$arrMail = $objMailHelper->sfGetSendHistory($_GET['send_id']);
+ $this->mail = $arrMail[0];
}
break;
+ case 'presend';
+ $this->mail['body'] = $_POST['body'];
default:
}
- $this->mail = $arrMail[0];
+
$this->setTemplate($this->tpl_mainpage);
}
削除: branches/version-2_5-dev/html/admin/mail/sendmail.php
===================================================================
--- branches/version-2_5-dev/html/admin/mail/sendmail.php 2011-02-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/html/admin/mail/sendmail.php 2011-02-23 07:23:39 UTC (rev 20343)
@@ -1,35 +0,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-// {{{ requires
-require_once '../require.php';
-require_once CLASS_EX_REALDIR . 'page_extends/admin/mail/LC_Page_Admin_Mail_Sendmail_Ex.php';
-
-// }}}
-// {{{ generate page
-
-$objPage = new LC_Page_Admin_Mail_Sendmail_Ex();
-register_shutdown_function(array($objPage, 'destroy'));
-$objPage->init();
-$objPage->process();
-?>
変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-23 07:18:09 UTC (rev 20342)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-23 07:23:39 UTC (rev 20343)
@@ -1026,8 +1026,6 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('DEBUG_MODE', 'false', 72, 'デバッグモード(true：sfPrintRやDBのエラーメッセージを出力する、false：出力しない)');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('ADMIN_ID', '"1"', 73, '管理ユーザID(メンテナンス用表示されない。)');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('CUSTOMER_CONFIRM_MAIL', 'false', 74, '会員登録時に仮会員確認メールを送信するか (true:仮会員、false:本会員)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MELMAGA_SEND', 'true', 75, 'メルマガ配信(true:配信する、false:配信しない)');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MELMAGA_BATCH_MODE', 'false', 76, 'メイルマガジンバッチモード(true:バッチで送信する ※要cron設定、false:リアルタイムで送信する)');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LOGIN_FRAME', '"login_frame.tpl"', 77, 'ログイン画面フレーム');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIN_FRAME', '"main_frame.tpl"', 78, '管理画面フレーム');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('SITE_FRAME', '"site_frame.tpl"', 79, '一般サイト画面フレーム');
Svn-src-all メーリングリストの案内