Changeset 18020

Timestamp:

2009/05/20 13:26:36 (15 years ago)

Author:

Seasoft

Message:

merge 17768, 17791
・取得元: version-2_4
【取得元のログメッセージ】
EC-CUBE2.4改修 #309
#309 仮登録完了メール再送機能の対応

Location:

branches/comu-ver2/data/class

Files:

• SC_CustomerList.php (modified) (2 diffs)
• pages/admin/customer/LC_Page_Admin_Customer.php (modified) (1 diff)

branches/comu-ver2/data/class/SC_CustomerList.php

@@ -28 +28 @@
 
     var $arrColumnCSV;
-            
+
     function SC_CustomerList($array, $mode = '') {
         parent::SC_SelectSql($array);
@@ -197 +197 @@
             // PCサイトメールが指定されている場合
             if ( strlen($this->arrSql['mail_type']) > 0 && $this->arrSql['mail_type'] == 1) {
-                // 携帯ドメインを外す。
-                foreach($arrMobileDomain as $mobile_domain) {
-                    $this->setWhere(" dtb_customer.email NOT ILIKE '%$mobile_domain' ");                    
-                }
+                // 携帯ドメインを外す。
+                foreach($arrMobileDomain as $mobile_domain) {
+                    $this->setWhere(" dtb_customer.email NOT ILIKE '%$mobile_domain' ");
+                }
             // 携帯サイトメールが指定されている場合
             } else if( strlen($this->arrSql['mail_type']) > 0 && $this->arrSql['mail_type'] == 2) {
-                $this->setWhere( " dtb_customer.email_mobile <> ''  ");
+                $this->setWhere( " dtb_customer.email_mobile <> ''  ");
             }
         }

branches/comu-ver2/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -214 +214 @@
         // 登録メール再送
         if ($_POST['mode'] == "resend_mail") {
-            $CONF = $objDb->sf_getBasisData();
-            $this->CONF = $CONF;
-            $objMailText = new SC_SiteView();
-            $objMailText->assignobj($this);
-            $mailHelper = new SC_Helper_Mail_Ex();
-
             $arrRet = $objQuery->select("name01, name02, secret_key, email", "dtb_customer","customer_id = ? AND del_flg <> 1 AND status = 1", array($_POST["edit_customer_id"]));
-
-            $this->name01 = $arrRet[0]['name01'];
-            $this->name02 = $arrRet[0]['name02'];
-            $this->uniqid = $arrRet[0]['secret_key'];
-
-
-            $subject = $mailHelper->sfMakesubject('会員登録のご確認');
-            $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
-
-            $objMail = new SC_SendMail();
-            $objMail->setItem(
-                                ''                  //　宛先
-                                , $subject              //　サブジェクト
-                                , $toCustomerMail         //　本文
-                                , $CONF["email03"]          //　配送元アドレス
-                                , $CONF["shop_name"]        //　配送元　名前
-                                , $CONF["email03"]          //　reply_to
-                                , $CONF["email04"]          //　return_path
-                                , $CONF["email04"]          //  Errors_to
-                            );
-            // 宛先の設定
-            $name = $this->name01 . $this->name02 ." 様";
-            $objMail->setTo($arrRet[0]["email"], $name);
-            $objMail->sendMail();
+            if( is_array($arrRet) === true && count($arrRet) > 0 ){
+
+                $this->name01 = $arrRet[0]['name01'];
+                $this->name02 = $arrRet[0]['name02'];
+                $this->uniqid = $arrRet[0]['secret_key'];
+
+                $CONF = $objDb->sf_getBasisData();
+                $this->CONF = $CONF;
+                $objMailText = new SC_SiteView();
+                $objMailText->assignobj($this);
+                $mailHelper = new SC_Helper_Mail_Ex();
+
+                $subject = $mailHelper->sfMakesubject('会員登録のご確認');
+                $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
+
+                $objMail = new SC_SendMail();
+                $objMail->setItem(
+                                    ''                  //　宛先
+                                    , $subject          //　サブジェクト
+                                    , $toCustomerMail   //　本文
+                                    , $CONF["email03"]  //　配送元アドレス
+                                    , $CONF["shop_name"]//　配送元　名前
+                                    , $CONF["email03"]  //　reply_to
+                                    , $CONF["email04"]  //　return_path
+                                    , $CONF["email04"]  //  Errors_to
+                                 );
+                // 宛先の設定
+                $name = $this->name01 . $this->name02 ." 様";
+                $objMail->setTo($arrRet[0]["email"], $name);
+                $objMail->sendMail();
+            }
 
         }
 
         if ($_POST['mode'] == "search" || $_POST['mode'] == "csv"  || $_POST['mode'] == "delete" || $_POST['mode'] == "delete_all" || $_POST['mode'] == "resend_mail") {
+
             // 入力文字の強制変換
             $this->lfConvertParam();