Changeset 18726 for branches/version-2_4/data/class/pages/contact/LC_Page_Contact.php

Timestamp:

2010/06/22 15:01:42 (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:

1933

bzr:revprop:branch-nick:

branches/version-2_4

bzr:root:

branches/version-2_4

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:18555
html/install/sql/insert_data.sql [email protected]

bzr:timestamp:

2010-06-22 15:01:38.634000063 +0900

bzr:user-agent:

bzr2.1.1+bzr-svn1.0.2

svn:original-date:

2010-06-22T06:01:38.634000Z

Message:

merged r18671

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

File:

• branches/version-2_4/data/class/pages/contact/LC_Page_Contact.php (modified) (1 diff)

branches/version-2_4/data/class/pages/contact/LC_Page_Contact.php

@@ -242 +242 @@
 
         $objQuery = new SC_Query();
-        $objMailText = new SC_SiteView();
         $objSiteInfo = $this->objView->objSiteInfo;
         $arrInfo = $objSiteInfo->data;
         $objPage->tpl_shopname=$arrInfo['shop_name'];
         $objPage->tpl_infoemail = $arrInfo['email02'];
-        $objMailText->assignobj($objPage);
-        $toCustomerMail = $objMailText->fetch("mail_templates/contact_mail.tpl");
-        $objMail = new SC_SendMail();
-
-        if ( $objPage->arrForm['email'] ) {
-            $fromMail_name = $objPage->arrForm['name01'] ." 様";
-            $fromMail_address = $objPage->arrForm['email'];
-        } else {
-            $fromMail_name = $CONF["shop_name"];
-            $fromMail_address = $CONF["email02"];
-        }
+
+        $fromMail_name = $objPage->arrForm['name01'] ." 様";
+        $fromMail_address = $objPage->arrForm['email'];
+
         $helperMail = new SC_Helper_Mail_Ex();
-        $subject = $helperMail->sfMakeSubject($objQuery, $objMailText, $this, "お問い合わせがありました。");
-        $objMail->setItem(
-                              $CONF["email02"]                  //　宛先
-                            , $subject                          //　サブジェクト
-                            , $toCustomerMail                   //　本文
-                            , $fromMail_address                 //　配送元アドレス
-                            , $fromMail_name                    //　配送元　名前
-                            , $fromMail_address                 //　reply_to
-                            , $CONF["email04"]                  //　return_path
-                            , $CONF["email04"]                  //  Errors_to
-                                                            );
-        $objMail->sendMail();
-
-        $subject = $helperMail->sfMakeSubject($objQuery, $objMailText, $this, "お問い合わせを受け付けました。");
-        $objMail->setItem(
-                              ''                                //　宛先
-                            , $subject                          //　サブジェクト
-                            , $toCustomerMail                   //　本文
-                            , $CONF["email03"]                  //　配送元アドレス
-                            , $CONF["shop_name"]                //　配送元　名前
-                            , $CONF["email02"]                  //　reply_to
-                            , $CONF["email04"]                  //　return_path
-                            , $CONF["email04"]                  //  Errors_to
-                                                            );
-        $objMail->setTo($objPage->arrForm['email'], $objPage->arrForm['name01'] ." 様");
-        $objMail->sendMail();
+        $helperMail->sfSendTemplateMail($CONF["email02"], $CONF["shop_name"], "5", $objPage, $fromMail_address, $fromMail_name, $fromMail_address); 
+        $helperMail->sfSendTemplateMail($objPage->arrForm['email'], $objPage->arrForm['name01'] ." 様", "5", $objPage, $CONF["email03"], $CONF["shop_name"], $CONF["email02"]);
     }
 }