Changeset 18671 for branches/version-2_4-dev/data/class/helper/SC_Helper_Mail.php

Timestamp:

2010/06/04 19:52:12 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php
data/class/pages/contact/LC_Page_Contact.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcontact%2FLC_Page_Contact.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

1949

bzr:revprop:branch-nick:

branches/version-2_4-dev

bzr:root:

branches/version-2_4-dev

bzr:text-parents:

data/class/helper/SC_Helper_Mail.php [email protected]
data/class/pages/contact/LC_Page_Contact.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18559
html/install/sql/insert_data.sql svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18601

bzr:timestamp:

2010-06-04 19:52:08.944000006 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-04T10:52:08.944000Z

Message:

merged r17375

• 携帯での受注メールが受注キャンセルメールになるのを修正(#355)

File:

• branches/version-2_4-dev/data/class/helper/SC_Helper_Mail.php (modified) (2 diffs)

branches/version-2_4-dev/data/class/helper/SC_Helper_Mail.php

@@ -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();    // メール送信