Changeset 18609 for tmp/version-2_5-test/data/class/helper/SC_Helper_Mail.php

Timestamp:

2010/03/11 10:35:11 (14 years ago)

Author:

kajiwara

Message:

正式版にナイトリービルド版をマージしてみるテスト

File:

• tmp/version-2_5-test/data/class/helper/SC_Helper_Mail.php (modified) (6 diffs)

tmp/version-2_5-test/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();
@@ -65 +65 @@
         // メール送信処理
         $objSendMail = new SC_SendMail_Ex();
-        $from = $arrInfo['email03'];
-        $error = $arrInfo['email04'];
-        $tosubject = $tmp_subject;
-        $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error);
+        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 = $this->sfMakeSubject($tmp_subject);
+        
+        $objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error);
         $objSendMail->setTo($to, $to_name);
         $objSendMail->sendMail();    // メール送信
@@ -143 +146 @@
         $from = $arrInfo['email03'];
         $error = $arrInfo['email04'];
-
-        $tosubject = $this->sfMakeSubject($objQuery, $objMailView,
-                                             $objPage, $tmp_subject);
+        $tosubject = $this->sfMakeSubject($tmp_subject);
 
         $objSendMail->setItem('', $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
@@ -162 +163 @@
 
     // テンプレートを使用したメールの送信
-    function sfSendTplMail($to, $subject, $tplpath, &$objPage) {
+    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage) {
         $objMailView = new SC_SiteView();
         $objSiteInfo = new SC_SiteInfo();
@@ -173 +174 @@
         // メール送信処理
         $objSendMail = new SC_SendMail_Ex();
-        $to = mb_encode_mimeheader($to);
         $bcc = $arrInfo['email01'];
         $from = $arrInfo['email03'];
         $error = $arrInfo['email04'];
-        $objSendMail->setItem($to, $subject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
+        $tosubject = $this->sfMakeSubject($tmp_subject);
+        
+        $objSendMail->setItem($to, $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
         $objSendMail->sendMail();
     }
 
     // 通常のメール送信
-    function sfSendMail($to, $subject, $body) {
+    function sfSendMail($to, $tmp_subject, $body) {
         $objSiteInfo = new SC_SiteInfo();
         $arrInfo = $objSiteInfo->data;
@@ -190 +192 @@
         $from = $arrInfo['email03'];
         $error = $arrInfo['email04'];
-        $objSendMail->setItem($to, $subject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
+        $tosubject = $this->sfMakeSubject($tmp_subject);
+        
+        $objSendMail->setItem($to, $tosubject, $body, $from, $arrInfo['shop_name'], $from, $error, $error, $bcc);
         $objSendMail->sendMail();
     }
 
     //件名にテンプレートを用いる
-    function sfMakeSubject(&$objQuery, &$objMailView, &$objPage, $subject){
-
+    function sfMakeSubject($subject) {
+        $objQuery = new SC_Query();
+        $objMailView = new SC_SiteView();
+        $objTplAssign = new stdClass;
+        
         $arrInfo = $objQuery->select("*","dtb_baseinfo");
         $arrInfo = $arrInfo[0];
-        $objPage->tpl_shopname=$arrInfo['shop_name'];
-        $objPage->tpl_infoemail=$subject;
-        $objMailView->assignobj($objPage);
-        $mailtitle = $objMailView->fetch('mail_templates/mail_title.tpl');
-        $ret = $mailtitle.$subject;
-        return $ret;
+        $objTplAssign->tpl_shopname=$arrInfo['shop_name'];
+        $objTplAssign->tpl_infoemail=$subject; // 従来互換
+        $objTplAssign->tpl_mailtitle=$subject;
+        $objMailView->assignobj($objTplAssign);
+        $subject = $objMailView->fetch('mail_templates/mail_title.tpl');
+        return $subject;
     }