Changeset 21820 for branches/version-2_12-dev/data

Timestamp:

2012/05/10 17:57:04 (12 years ago)

Author:

adachi

Message:

#1797 #1798 メールテンプレートでfilterが動作するように修正

Location:

branches/version-2_12-dev/data/class

Files:

• SC_View.php (modified) (4 diffs)
• helper/SC_Helper_Mail.php (modified) (8 diffs)
• pages/admin/customer/LC_Page_Admin_Customer.php (modified) (1 diff)
• pages/admin/order/LC_Page_Admin_Order_Mail.php (modified) (2 diffs)
• pages/contact/LC_Page_Contact.php (modified) (1 diff)
• pages/entry/LC_Page_Entry.php (modified) (2 diffs)
• pages/forgot/LC_Page_Forgot.php (modified) (1 diff)
• pages/regist/LC_Page_Regist.php (modified) (2 diffs)
• pages/shopping/LC_Page_Shopping_Confirm.php (modified) (2 diffs)

branches/version-2_12-dev/data/class/SC_View.php

@@ -72 +72 @@
             $this->_smarty->force_compile = false;
         }
+        // 各filterをセットします.
+        $this->registFilter();
     }
 
@@ -100 +102 @@
             }
         }
-        // 各filterをセットします.
-        $this->registFilter();
         $res =  $this->_smarty->fetch($template);
         if (ADMIN_MODE == '1') {
@@ -136 +136 @@
      */
     function prefilter_transform($source, &$smarty) {
-        // フックポイントを実行.
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
-        $objPlugin->doAction('prefilterTransform', array(&$source, $this->objPage, $smarty->_current_file));
+        if (!is_null($this->objPage)) {
+            // フックポイントを実行.
+            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
+            $objPlugin->doAction('prefilterTransform', array(&$source, $this->objPage, $smarty->_current_file));
+        }
         return $source;
     }
@@ -149 +151 @@
      */
     function outputfilter_transform($source, &$smarty) {
-        // フックポイントを実行.
-        $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
-        $objPlugin->doAction('outputfilterTransform', array(&$source, $this->objPage, $smarty->_current_file));
+        if (!is_null($this->objPage)) {
+            // フックポイントを実行.
+            $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->objPage->plugin_activate_flg);
+            $objPlugin->doAction('outputfilterTransform', array(&$source, $this->objPage, $smarty->_current_file));
+        }
         return $source;
     }

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

@@ -35 +35 @@
 
     /**
+     * LC_Pageオブジェクト.
+     * 
+     * @var LC_Page
+     */
+    protected $objPage;
+
+    /**
      * コンストラクタ.
      */
@@ -43 +50 @@
     }
 
+    /**
+     * LC_Pageオブジェクトをセットします.
+     * 
+     * @param LC_Page $objPage
+     */
+    function setPage(LC_Page $objPage) {
+        $this->objPage = $objPage;
+    }
+
+    /**
+     * LC_Pageオブジェクトを返します.
+     * 
+     * @return LC_Page
+     */
+    function getPage() {
+        return $this->objPage;
+    }
+    
     /* DBに登録されたテンプレートメールの送信 */
     function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '') {
@@ -57 +82 @@
 
         $objMailView = new SC_SiteView_Ex();
+        $objMailView->setPage($this->getPage());
         // メール本文の取得
         $objMailView->assignobj($objPage);
@@ -150 +176 @@
         $arrTplVar->tpl_user_point = $objCustomer->getValue('point');
 
+        $objMailView = null;
         if (SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE) {
             $objMailView = new SC_MobileView_Ex();
@@ -156 +183 @@
         }
         // メール本文の取得
+        $objMailView->setPage($this->getPage());
         $objMailView->assignobj($arrTplVar);
         $body = $objMailView->fetch($this->arrMAILTPLPATH[$template_id]);
@@ -182 +210 @@
     function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage) {
         $objMailView = new SC_SiteView_Ex();
+        $objMailView->setPage($this->getPage());
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         // メール本文の取得
@@ -217 +246 @@
         if (empty($objMailView)) {
             $objMailView = new SC_SiteView_Ex();
+            $objMailView->setPage($this->getPage());
         }
         $objTplAssign = new stdClass;
@@ -284 +314 @@
 
         $objMailText = new SC_SiteView_Ex();
+        $objMailText->setPage($this->getPage());
         $objMailText->assign('CONF', $CONF);
         $objMailText->assign('name01', $arrCustomerData['name01']);

branches/version-2_12-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -206 +206 @@
         // 登録メール再送
         $objHelperMail = new SC_Helper_Mail_Ex();
+        $objHelperMail->setPage($this);
         $objHelperMail->sfSendRegistMail($arrData['secret_key'], $customer_id);
         return true;

branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php

@@ -172 +172 @@
             foreach ($order_id_array as $order_id){
                 $objMail = new SC_Helper_Mail_Ex();
+                $objMail->setPage($this);
                 $objSendMail = $objMail->sfSendOrderMail($order_id,
                 $objFormParam->getValue('template_id'),
@@ -194 +195 @@
             // 注文受付メール(送信なし)
             $objMail = new SC_Helper_Mail_Ex();
+            $objMail->setPage($this);
             $objSendMail = $objMail->sfSendOrderMail(
-            $objFormParam->getValue('order_id'),
-            $objFormParam->getValue('template_id'),
-            $objFormParam->getValue('subject'),
-            $objFormParam->getValue('header'),
-            $objFormParam->getValue('footer'), false);
+                $objFormParam->getValue('order_id'),
+                $objFormParam->getValue('template_id'),
+                $objFormParam->getValue('subject'),
+                $objFormParam->getValue('header'),
+                $objFormParam->getValue('footer'), false);
 
             $this->tpl_subject = $objFormParam->getValue('subject');

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

@@ -197 +197 @@
         $objPage->tpl_infoemail = $CONF['email02'];
         $helperMail = new SC_Helper_Mail_Ex();
+        $helperMail->setPage($this);
         $helperMail->sfSendTemplateMail(
             $objPage->arrForm['email']['value'],            // to

branches/version-2_12-dev/data/class/pages/entry/LC_Page_Entry.php

@@ -236 +236 @@
 
         $objMailText    = new SC_SiteView_Ex();
+        $objMailText->setPage($this);
         $objMailText->assign('CONF', $CONF);
         $objMailText->assign('name01', $arrForm['name01']);
@@ -243 +244 @@
 
         $objHelperMail  = new SC_Helper_Mail_Ex();
+        $objHelperMail->setPage($this);
 
         // 仮会員が有効の場合

branches/version-2_12-dev/data/class/pages/forgot/LC_Page_Forgot.php

@@ -285 +285 @@
         // パスワード変更お知らせメール送信
         $objMailText = new SC_SiteView_Ex(false);
+        $objMailText->setPage($this);
         $objMailText->assign('customer_name', $customer_name);
         $objMailText->assign('new_password', $new_password);
         $toCustomerMail = $objMailText->fetch('mail_templates/forgot_mail.tpl');
-        $objHelperMail  = new SC_Helper_Mail_Ex();
+
+        $objHelperMail = new SC_Helper_Mail_Ex();
+        $objHelperMail->setPage($this);
+        
         // メール送信オブジェクトによる送信処理
         $objMail = new SC_SendMail();

branches/version-2_12-dev/data/class/pages/regist/LC_Page_Regist.php

@@ -149 +149 @@
         $objCustomer    = new SC_Customer_Ex();
         $objHelperMail  = new SC_Helper_Mail_Ex();
+        $objHelperMail->setPage($this);
         $CONF           = SC_Helper_DB_Ex::sfGetBasisData();
 
@@ -158 +159 @@
         //--　メール送信
         $objMailText    = new SC_SiteView_Ex();
+        $objMailText->setPage($this);
         $objMailText->assign('CONF', $CONF);
         $objMailText->assign('name01', $data['name01']);

branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

@@ -77 +77 @@
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objPurchase = new SC_Helper_Purchase_Ex();
-
+        $objHelperMail = new SC_Helper_Mail();
+        $objHelperMail->setPage($this);
+        
         $this->is_multiple = $objPurchase->isMultiple();
 
@@ -164 +166 @@
                 else {
                     $objPurchase->completeOrder(ORDER_NEW);
-                    $objPurchase->sendOrderMail($this->arrForm['order_id']);
-
+                    $template_id = SC_Display_Ex::detectDevice() == DEVICE_TYPE_MOBILE ? 2 : 1;
+                    $objHelperMail->sfSendOrderMail(
+                            $this->arrForm['order_id'],
+                            $template_id);
 
                     SC_Response_Ex::sendRedirect(SHOPPING_COMPLETE_URLPATH);