Changeset 17092

Timestamp:

2008/02/28 12:00:48 (16 years ago)

Author:

satou

Message:

#234 メールバックエンドによるメール配信の不具合を修正

File:

• branches/version-2/data/class/SC_SendMail.php (modified) (9 diffs)

branches/version-2/data/class/SC_SendMail.php

@@ -64 +64 @@
 
     // 送信先の設定
-    function setRecip($recipient) {
-        $this->arrRecip[] = $recipient;
+    function setRecip($key, $recipient) {
+        $this->arrRecip[$key] = $recipient;
     }
     
@@ -72 +72 @@
         if($to != "") {
             $this->to = $this->getNameAddress($to_name, $to);
-            $this->setRecip($to);
+            $this->setRecip("To", $to);
         }
     }
@@ -85 +85 @@
         if($cc != "") {
             $this->cc = $this->getNameAddress($cc_name, $cc);
-            $this->setRecip($cc);
+            $this->setRecip("Cc", $cc);
         }
     }
@@ -93 +93 @@
         if($bcc != "") {
             $this->bcc = $bcc;
-            $this->setRecip($bcc);
+            $this->setRecip("Bcc", $bcc);
         }
     }
@@ -243 +243 @@
         return $arrHeader;
     }
+    
+    // 送信先を返す
+    function getRecip() {
+        switch ($this->backend) {
+        case "mail":
+            return $this->to;
+            break;
+        case "sendmail":
+        case "smtp":
+        default:
+            return $this->arrRecip;
+            break;
+        }
+    }
 
     //  TXTメール送信を実行する
@@ -248 +262 @@
         $header = $this->getTEXTHeader();
         // メール送信
-        $result = $this->objMail->send($this->arrRecip, $header, $this->body);
+        $result = $this->objMail->send($this->getRecip(), $header, $this->body);
         if (PEAR::isError($result)) {
             GC_Utils_Ex::gfPrintLog($result->getMessage());
@@ -261 +275 @@
         $header = $this->getHTMLHeader();
         // メール送信
-        $result = $this->objMail->send($this->arrRecip, $header, $this->body);
+        $result = $this->objMail->send($this->getRecip(), $header, $this->body);
         if (PEAR::isError($result)) {
             GC_Utils_Ex::gfPrintLog($result->getMessage());
@@ -279 +293 @@
         switch ($backend) {
         case "mail":
-            $arrParams = array();
+            $arrParams = array();
             break;
         case "sendmail":
@@ -292 +306 @@
                                'port' => $this->port
                                );
+            break;
         }
         return $arrParams;