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

Timestamp:

2013/05/02 18:11:36 (11 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

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

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

@@ -29 +29 @@
  * @version $Id$
  */
-class SC_Helper_Mail 
-{
+class SC_Helper_Mail {
 
     /** メールテンプレートのパス */
@@ -45 +44 @@
      * コンストラクタ.
      */
-    function __construct()
-    {
+    function __construct() {
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrMAILTPLPATH =  $masterData->getMasterData('mtb_mail_tpl_path');
@@ -57 +55 @@
      * @param LC_Page $objPage
      */
-    function setPage(LC_Page $objPage)
-    {
+    function setPage(LC_Page $objPage) {
         $this->objPage = $objPage;
     }
@@ -67 +64 @@
      * @return LC_Page
      */
-    function getPage()
-    {
+    function getPage() {
         return $this->objPage;
     }
 
     /* DBに登録されたテンプレートメールの送信 */
-    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '')
-    {
-
+    function sfSendTemplateMail($to, $to_name, $template_id, &$objPage, $from_address = '', $from_name = '', $reply_to = '', $bcc = '') {
+
+        $objQuery =& SC_Query_Ex::getSingletonInstance();
         // メールテンプレート情報の取得
-        $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-        $mailtemplate = $objMailtemplate->get($template_id);
-        $objPage->tpl_header = $mailtemplate['header'];
-        $objPage->tpl_footer = $mailtemplate['footer'];
-        $tmp_subject = $mailtemplate['subject'];
+        $where = 'template_id = ?';
+        $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id));
+        $objPage->tpl_header = $arrRet[0]['header'];
+        $objPage->tpl_footer = $arrRet[0]['footer'];
+        $tmp_subject = $arrRet[0]['subject'];
 
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
@@ -105 +101 @@
 
     /* 受注完了メール送信 */
-    function sfSendOrderMail($order_id, $template_id, $subject = '', $header = '', $footer = '', $send = true)
-    {
+    function sfSendOrderMail($order_id, $template_id, $subject = '', $header = '', $footer = '', $send = true) {
 
         $arrTplVar = new stdClass();
@@ -116 +111 @@
         if ($subject == '' && $header == '' && $footer == '') {
             // メールテンプレート情報の取得
-            $objMailtemplate = new SC_Helper_Mailtemplate_Ex();
-            $mailtemplate = $objMailtemplate->get($template_id);
-            $arrTplVar->tpl_header = $mailtemplate['header'];
-            $arrTplVar->tpl_footer = $mailtemplate['footer'];
-            $tmp_subject = $mailtemplate['subject'];
+            $where = 'template_id = ?';
+            $arrRet = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($template_id));
+            $arrTplVar->tpl_header = $arrRet[0]['header'];
+            $arrTplVar->tpl_footer = $arrRet[0]['footer'];
+            $tmp_subject = $arrRet[0]['subject'];
         } else {
             $arrTplVar->tpl_header = $header;
@@ -218 +213 @@
 
     // テンプレートを使用したメールの送信
-    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage)
-    {
+    function sfSendTplMail($to, $tmp_subject, $tplpath, &$objPage) {
         $objMailView = new SC_SiteView_Ex();
         $objMailView->setPage($this->getPage());
@@ -240 +234 @@
 
     // 通常のメール送信
-    function sfSendMail($to, $tmp_subject, $body)
-    {
+    function sfSendMail($to, $tmp_subject, $body) {
         $arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
         // メール送信処理
@@ -255 +248 @@
 
     //件名にテンプレートを用いる
-    function sfMakeSubject($subject, &$objMailView)
-    {
+    function sfMakeSubject($subject, &$objMailView) {
         if (empty($objMailView)) {
             $objMailView = new SC_SiteView_Ex();
@@ -275 +267 @@
 
     // メール配信履歴への登録
-    function sfSaveMailHistory($order_id, $template_id, $subject, $body)
-    {
+    function sfSaveMailHistory($order_id, $template_id, $subject, $body) {
         $sqlval = array();
         $sqlval['subject'] = $subject;
@@ -296 +287 @@
 
     /* 会員登録があるかどうかのチェック(仮会員を含まない) */
-    function sfCheckCustomerMailMaga($email)
-    {
+    function sfCheckCustomerMailMaga($email) {
         $col = 'email, mailmaga_flg, customer_id';
         $from = 'dtb_customer';
@@ -318 +308 @@
      * @return boolean true:成功 false:失敗
      */
-    function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false)
-    {
+    function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false) {
         // 会員データの取得
         if (SC_Utils_Ex::sfIsInt($customer_id)) {
@@ -382 +371 @@
      * @todo   表示順も引数で変更できるように
      */
-    function sfGetMailmagaTemplate($template_id = null)
-    {
+    function sfGetMailmagaTemplate($template_id = null) {
         // 初期化
         $where = '';
@@ -409 +397 @@
      * @return　array 送信履歴情報を格納した配列
      */
-    function sfGetSendHistory($send_id = null)
-    {
+    function sfGetSendHistory($send_id = null) {
         // 初期化
         $where = '';
@@ -438 +425 @@
      * @return　void
      */
-    function sfSendMailmagazine($send_id)
-    {
+    function sfSendMailmagazine($send_id) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $objDb = new SC_Helper_DB_Ex();