Changeset 17590 for branches/comu-ver2/data/class/helper/SC_Helper_Mail.php

Timestamp:

2008/09/02 16:17:59 (16 years ago)

Author:

Seasoft

Message:

・r17375 に対応する初期データを追加
・SC_Helper_Mail::sfMakeSubject() でのオブジェクト流用(参照渡し)を解消。呼び出し元から変数を渡すことを想定していたのか不安がある。
・未使用パラメータの削除

File:

• branches/comu-ver2/data/class/helper/SC_Helper_Mail.php (modified) (5 diffs)

branches/comu-ver2/data/class/helper/SC_Helper_Mail.php

@@ -69 +69 @@
         if ($reply_to == "") $reply_to = $arrInfo['email03'];
         $error = $arrInfo['email04'];
-        $tosubject = $tmp_subject;
+        $tosubject = $this->sfMakeSubject($tmp_subject);
+        
         $objSendMail->setItem('', $tosubject, $body, $from_address, $from_name, $reply_to, $error, $error);
         $objSendMail->setTo($to, $to_name);
@@ -145 +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);
@@ -164 +163 @@
 
     // テンプレートを使用したメールの送信
-    function sfSendTplMail($to, $subject, $tplpath, &$objPage) {
+    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage) {
         $objMailView = new SC_SiteView();
         $objSiteInfo = new SC_SiteInfo();
@@ -179 +178 @@
         $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;
@@ -192 +193 @@
         $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;
     }