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

Timestamp:

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

Author:

m_uehara

Message:

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

File:

• branches/version-2_12-multilang/data/class/SC_SendMail.php (modified) (5 diffs)

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;
     }