Changeset 22268

Timestamp:

2013/01/17 18:03:33 (13 years ago)

Author:

m_uehara

Message:

#2030 メールの文字コード・コンテンツタイプを定数に差し替えました。

Location:

branches/version-2_12-multilang

Files:

• data/class/SC_SendMail.php (modified) (5 diffs)
• data/mtb_constants_init.php (modified) (1 diff)
• data/mtb_constants_init_en-US.php (modified) (1 diff)
• html/install/sql/insert_data.sql (modified) (1 diff)
• html/install/sql/insert_data_en-US.sql (modified) (1 diff)

branches/version-2_12-multilang/data/class/SC_SendMail.php

@@ -109 +109 @@
     // 件名の設定
     function setSubject($subject) {
-        $this->subject = mb_encode_mimeheader($subject, 'JIS', 'B', "\n");
+        $this->subject = mb_encode_mimeheader($subject, MAIL_CHARACTER_CODE, 'B', "\n");
         $this->subject = str_replace(array("\r\n", "\r"), "\n", $this->subject);
     }
@@ -115 +115 @@
     // 本文の設定
     function setBody($body) {
-        // iso-2022-jpだと特殊文字が？で送信されるのでJISを使用する
-        $this->body = mb_convert_encoding($body, 'JIS', CHAR_CODE);
+        $this->body = mb_convert_encoding($body, MAIL_CHARACTER_CODE, CHAR_CODE);
     }
 
@@ -157 +156 @@
                 // 制御文字を変換する。
                 $_name = $name;
-                $_name = mb_encode_mimeheader($_name, 'JIS', 'B', "\n");
+                $_name = mb_encode_mimeheader($_name, MAIL_CHARACTER_CODE, 'B', "\n");
                 $_name = str_replace('"', '\"', $_name);
                 $name_address = sprintf('"%s" <%s>', $_name, $mail_address);
@@ -238 +237 @@
     function getTEXTHeader() {
         $arrHeader = $this->getBaseHeader();
-        $arrHeader['Content-Type'] = 'text/plain; charset="ISO-2022-JP"';
+        $arrHeader['Content-Type'] = 'text/plain; charset="' . MAIL_HEADER_CONTENT_TYPE . '"';
         return $arrHeader;
     }
@@ -245 +244 @@
     function getHTMLHeader() {
         $arrHeader = $this->getBaseHeader();
-        $arrHeader['Content-Type'] = 'text/html; charset="ISO-2022-JP"';
+        $arrHeader['Content-Type'] = 'text/html; charset="' . MAIL_HEADER_CONTENT_TYPE . '"';
         return $arrHeader;
     }

branches/version-2_12-multilang/data/mtb_constants_init.php

@@ -473 +473 @@
 /** MYページ：ご注文状況表示フラグ */
 define('MYPAGE_ORDER_STATUS_DISP_FLAG', true);
+/** メールの文字コード */
+define('MAIL_CHARACTER_CODE', 'JIS');
+/** メールヘッダーのコンテンツタイプ */
+define('MAIL_HEADER_CONTENT_TYPE', 'ISO-2022-JP');

branches/version-2_12-multilang/data/mtb_constants_init_en-US.php

@@ -473 +473 @@
 /** MY page: Order status display flag */
 define('MYPAGE_ORDER_STATUS_DISP_FLAG', true);
-
+/** メールの文字コード */
+define('MAIL_CHARACTER_CODE', 'UTF-8');
+/** メールヘッダーのコンテンツタイプ */
+define('MAIL_HEADER_CONTENT_TYPE', 'US-ASCII');

branches/version-2_12-multilang/html/install/sql/insert_data.sql

@@ -1256 +1256 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LOGIN_RETRY_INTERVAL', '0', 1411, 'ログイン失敗時の遅延時間(秒)(ブルートフォースアタック対策)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MYPAGE_ORDER_STATUS_DISP_FLAG', 'true', 1412, 'MYページ：ご注文状況表示フラグ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIL_CHARACTER_CODE', '"JIS"', 1413, 'メールの文字コード');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIL_HEADER_CONTENT_TYPE', '"ISO-2022-JP"', 1414, 'メールヘッダーのコンテンツタイプ');
 
 INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_customer', 'email_mobile', 0, '会員数増加時のログイン処理速度を向上させたいときに試してみてください');

branches/version-2_12-multilang/html/install/sql/insert_data_en-US.sql

@@ -1245 +1245 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('LOGIN_RETRY_INTERVAL', '0', 1411, 'Delay time when login fails (seconds) (measure against brute force attack)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MYPAGE_ORDER_STATUS_DISP_FLAG', 'true', 1412, 'MY page: Order status display flag');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIL_CHARACTER_CODE', '"UTF-8"', 1413, 'メールの文字コード');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('MAIL_HEADER_CONTENT_TYPE', '"US-ASCII"', 1414, 'メールヘッダーのコンテンツタイプ');
 
 INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_customer', 'email_mobile', 0, 'Try when you want to improve the login processing speed when there is an increase in the number of members');