|
@@ 406-411 (lines=6) @@
|
| 403 |
|
// prepare addressee list; moved the adding of addresses to the mailobject down |
| 404 |
|
// to |
| 405 |
|
|
| 406 |
|
foreach(Mail::parseAddressList($mailObject->getHeader("To")) as $addressObject) { |
| 407 |
|
if (!$addressObject->valid) continue; |
| 408 |
|
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail To: ".array2string($addressObject) ); |
| 409 |
|
//$mailObject->AddAddress($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal); |
| 410 |
|
$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal); |
| 411 |
|
} |
| 412 |
|
// CC |
| 413 |
|
foreach(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) { |
| 414 |
|
if (!$addressObject->valid) continue; |
|
@@ 413-418 (lines=6) @@
|
| 410 |
|
$toMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal); |
| 411 |
|
} |
| 412 |
|
// CC |
| 413 |
|
foreach(Mail::parseAddressList($mailObject->getHeader("Cc")) as $addressObject) { |
| 414 |
|
if (!$addressObject->valid) continue; |
| 415 |
|
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail CC: ".array2string($addressObject) ); |
| 416 |
|
//$mailObject->AddCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal); |
| 417 |
|
$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal); |
| 418 |
|
} |
| 419 |
|
// BCC |
| 420 |
|
foreach(Mail::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) { |
| 421 |
|
if (!$addressObject->valid) continue; |
|
@@ 420-425 (lines=6) @@
|
| 417 |
|
$ccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal); |
| 418 |
|
} |
| 419 |
|
// BCC |
| 420 |
|
foreach(Mail::parseAddressList($mailObject->getHeader("Bcc")) as $addressObject) { |
| 421 |
|
if (!$addressObject->valid) continue; |
| 422 |
|
ZLog::Write(LOGLEVEL_DEBUG,__METHOD__."(".__LINE__.") Header Sentmail BCC: ".array2string($addressObject) ); |
| 423 |
|
//$mailObject->AddBCC($addressObject->mailbox. ($addressObject->host ? '@'.$addressObject->host : ''),$addressObject->personal); |
| 424 |
|
$bccMailAddr[] = imap_rfc822_write_address($addressObject->mailbox, $addressObject->host, $addressObject->personal); |
| 425 |
|
} |
| 426 |
|
$mailObject->clearAllRecipients(); |
| 427 |
|
|
| 428 |
|
$use_orgbody = false; |