[Svn-src-all:2733] [version-2_12-dev 21632] #1531 (SC_SendMail#getHTMLHeader「Content-Transfer-Encoding: ISO-2022-JP」はRFC的に許容されない)

[Seasoft]

Subversion committed to /home/svn/open 21632
http://svn.ec-cube.net/open_trac/changeset/21632
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-12 16:00:36 +0900 (月, 12  3月 2012)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#1531 (SC_SendMail#getHTMLHeader「Content-Transfer-Encoding: ISO-2022-JP」はRFC的に許容されない)
#1613 (typo修正・ソース整形・ソースコメントの改善)

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/class/SC_CartSession.php
U   branches/version-2_12-dev/data/class/SC_SendMail.php

変更: branches/version-2_12-dev/data/class/SC_CartSession.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CartSession.php	2012-03-12 06:40:54 UTC (rev 21631)
+++ branches/version-2_12-dev/data/class/SC_CartSession.php	2012-03-12 07:00:36 UTC (rev 21632)
@@ -553,7 +553,7 @@
                         $total_inctax = SC_Helper_DB_Ex::sfCalcIncTax($item['price']) * $limit;
                         $this->setProductValue($item['id'], 'total_inctax', $total_inctax, $productTypeId);
                         $tpl_message .= '※「' . $product['name'] . '」は販売制限(または在庫が不足)しております。';
-                        $tpl_message .= "一度に数量{$limit}を超える購入はできません。" . "\n";
+                        $tpl_message .= "一度に数量{$limit}を超える購入はできません。\n";
                     } else {
                         $this->delProduct($item['cart_no'], $productTypeId);
                         $tpl_message .= '※「' . $product['name'] . "」は売り切れました。\n";

変更: branches/version-2_12-dev/data/class/SC_SendMail.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_SendMail.php	2012-03-12 06:40:54 UTC (rev 21631)
+++ branches/version-2_12-dev/data/class/SC_SendMail.php	2012-03-12 07:00:36 UTC (rev 21632)
@@ -109,6 +109,7 @@
 
     // 本文の設定
     function setBody($body) {
+        // iso-2022-jpだと特殊文字が？で送信されるのでJISを使用する
         $this->body = mb_convert_encoding($body, 'JIS', CHAR_CODE);
     }
 
@@ -175,7 +176,7 @@
         $this->setTo($to);
         // 件名設定
         $this->setSubject($subject);
-        // 本文設定(iso-2022-jpだと特殊文字が？で送信されるのでJISを使用する)
+        // 本文設定
         $this->setBody($body);
         // 送信元設定
         $this->setFrom($fromaddress, $from_name);
@@ -214,6 +215,7 @@
             $arrHeader['Bcc'] = $this->bcc;
         }
         $arrHeader['Date'] = date('D, j M Y H:i:s O');
+        $arrHeader['Content-Transfer-Encoding'] = '7bit';
         return $arrHeader;
     }
 
@@ -221,7 +223,6 @@
     function getTEXTHeader() {
         $arrHeader = $this->getBaseHeader();
         $arrHeader['Content-Type'] = "text/plain; charset=\"ISO-2022-JP\"";
-        $arrHeader['Content-Transfer-Encoding'] = '7bit';
         return $arrHeader;
     }
 
@@ -229,7 +230,6 @@
     function getHTMLHeader() {
         $arrHeader = $this->getBaseHeader();
         $arrHeader['Content-Type'] = "text/html; charset=\"ISO-2022-JP\"";
-        $arrHeader['Content-Transfer-Encoding'] = 'ISO-2022-JP';
         return $arrHeader;
     }