Changeset 18758 for trunk/data/class/helper/SC_Helper_Mail.php

Timestamp:

2010/07/20 13:25:33 (16 years ago)

Author:

kajiwara

Message:

EC-CUBE Ver2.4.4 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=223）

File:

• trunk/data/class/helper/SC_Helper_Mail.php (modified) (4 diffs)

trunk/data/class/helper/SC_Helper_Mail.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -45 +45 @@
 
     /* DBに登録されたテンプレートメールの送信 */
-    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage) {
+    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = "", $from_name = "", $reply_to = "") {
 
         $objQuery = new SC_Query();
@@ -66 +66 @@
         $objSendMail = new SC_SendMail_Ex();
         $from = $arrInfo['email03'];
+        if ($from_address == "") $from_address = $arrInfo['email03'];
+        if ($from_name == "") $from_name = $arrInfo['shop_name'];
+        if ($reply_to == "") $reply_to = $arrInfo['email03'];
         $error = $arrInfo['email04'];
         $tosubject = $tmp_subject;
-        $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error);
+        $objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error);
         $objSendMail->setTo($to, $to_name);
         $objSendMail->sendMail();    // メール送信
@@ -173 +176 @@
         // メール送信処理
         $objSendMail = new SC_SendMail_Ex();
-        $to = mb_encode_mimeheader($to);
         $bcc = $arrInfo['email01'];
         $from = $arrInfo['email03'];