Skip to content

Commit b589a87

Browse files
committed
one address or addressess array
1 parent 0a4c54b commit b589a87

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

src/Mailer.php

+13-9
Original file line numberDiff line numberDiff line change
@@ -62,36 +62,40 @@ public function removeChannel($name)
6262

6363
/**
6464
* @param Message $message
65-
* @param string[] $to
65+
* @param string[]|string $to
6666
* @param string[]|string $channels
6767
* @throws RecipientsListEmptyException
6868
*/
6969
public function send(Message $message, $to, $channels = self::CHANNEL_ALL)
7070
{
71-
foreach ($to as $address) {
71+
$arrTo = (array)$to;
72+
foreach ($arrTo as $address) {
7273
$this->mass($message, array($address), array(), array(), $channels);
7374
}
7475
}
7576

7677
/**
7778
* @param Message $message
78-
* @param string[] $to
79-
* @param string[] $cc
80-
* @param string[] $bcc
79+
* @param string[]|string $to
80+
* @param string[]|string $cc
81+
* @param string[]|string $bcc
8182
* @param string[]|string $channels
8283
* @throws RecipientsListEmptyException
8384
*/
8485
public function mass(Message $message, $to, $cc = array(), $bcc = array(), $channels = self::CHANNEL_ALL)
8586
{
86-
$addresses = $this->getEmails(array_merge($to, $cc, $bcc));
87+
$arrTo = (array)$to;
88+
$arrCc = (array)$cc;
89+
$arrBcc = (array)$bcc;
90+
$addresses = $this->getEmails(array_merge($arrTo, $arrCc, $arrBcc));
8791
if (!$addresses) {
8892
throw new RecipientsListEmptyException();
8993
}
9094
$version = self::MAILER_VERSION;
9195
$message->setHeader("X-Mailer", "ddrv/mailer-$version (https://github.com/ddrv/mailer)");
92-
$message->setHeader("To", implode(", ", $this->getContacts($to)));
93-
$message->setHeader("Cc", implode(", ", $this->getContacts($cc)));
94-
$message->setHeader("Bcc", implode(", ", $this->getContacts($bcc)));
96+
$message->setHeader("To", implode(", ", $this->getContacts($arrTo)));
97+
$message->setHeader("Cc", implode(", ", $this->getContacts($arrCc)));
98+
$message->setHeader("Bcc", implode(", ", $this->getContacts($arrBcc)));
9599

96100
$ch = $this->getChannels($channels);
97101
foreach ($ch as $transport) {

src/Transport/File.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function send(Message $message, $recipients)
4343
if (!is_dir($dir)) mkdir($dir, 0775, true);
4444
$num = 1;
4545
do {
46-
$prefix = "mail_" . date(DATE_ATOM);
46+
$prefix = "mail_" . date("YmdHis");
4747
$suffix = str_pad($num, 3, "0", STR_PAD_LEFT);
4848
$file = implode(DIRECTORY_SEPARATOR, array($dir, "{$prefix}_{$suffix}.eml"));
4949
$num++;

0 commit comments

Comments
 (0)