[Svn-src-all:1358] [version-2_5-dev 20248] #963 [管理画面]メルマガ管理 r20245 で混入したバグ修正 r20247は無かったことにして！orz

[fukuda]

Subversion committed to /home/svn/open 20248
http://svn.ec-cube.net/open_trac/changeset/20248
┌────────────────────────────┐
│更新者　:  fukuda                                       │
│更新日時:  2011-02-20 12:29:01 +0900 (日, 20  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#963 	[管理画面]メルマガ管理 r20245 で混入したバグ修正 r20247は無かったことにして！orz

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl
U   branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php

変更: branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl	2011-02-20 03:26:39 UTC (rev 20247)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl	2011-02-20 03:29:01 UTC (rev 20248)
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 *}-->
-<form name="form1" id="form1" method="post" action="">
+<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF}-->">
 <input type="hidden" name="mode" value="<!--{$mode}-->" />
 <input type="hidden" name="template_id" value="<!--{$arrForm.template_id|h}-->" />
 <div id="mail" class="contents-main">

変更: 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-20 03:26:39 UTC (rev 20247)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	2011-02-20 03:29:01 UTC (rev 20248)
@@ -74,7 +74,7 @@
 
         // 認証可否の判定
         SC_Utils_Ex::sfIsSuccess($objSess);
-
+        
         switch ($this->getMode()) {
         case 'edit':
             // 編集
@@ -91,7 +91,7 @@
             $objFormParam->setParam($_POST);
             $this->arrErr = $objFormParam->checkError();
             $this->arrForm = $objFormParam->getHashArray();
-                        
+            
             if (SC_Utils_Ex::isBlank($this->arrErr)) {
                 // エラーが無いときは登録・編集
                 $this->lfRegistData( $objFormParam, $objFormParam->getValue('template_id'));
@@ -136,7 +136,10 @@
 
         if ( SC_Utils_Ex::sfIsInt($template_id) ){
             // 更新時
-            $objQuery->update("dtb_mailmaga_template", $sqlval, "template_id = ?", array($template_id));
+            $objQuery->update("dtb_mailmaga_template",
+                              $sqlval,
+                              "template_id = ?",
+                              array($template_id));
         } else {
             // 新規登録時
             $sqlval['create_date'] = "now()";
@@ -155,6 +158,7 @@
         $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);
     }
 
 }