Skip to content
Permalink
Browse files

EmailComponent: Accept arrays for $to variable (closes #293)

  • Loading branch information...
rchavik committed Feb 4, 2010
1 parent 3836592 commit a20c809796bf143b53488b9d3f7c50728a46ac06
Showing with 28 additions and 7 deletions.
  1. +28 −7 cake/libs/controller/components/email.php
@@ -363,7 +363,7 @@ function send($content = null, $template = null, $layout = null) {
*/
function reset() {
$this->template = null;
$this->to = null;
$this->to = array();
$this->from = null;
$this->replyTo = null;
$this->return = null;
@@ -473,7 +473,11 @@ function __createBoundary() {
*/
function __createHeader() {
if ($this->delivery == 'smtp') {
$this->__header[] = 'To: ' . $this->__formatAddress($this->to);
if (is_array($this->to)) {
$this->__header[] = 'To: ' . implode(', ', array_map(array($this, '__formatAddress'), $this->to));
} else {
$this->__header[] = 'To: ' . $this->__formatAddress($this->to);
}
}
$this->__header[] = 'From: ' . $this->__formatAddress($this->from);
@@ -692,10 +696,15 @@ function __strip($value, $message = false) {
function __mail() {
$header = implode("\n", $this->__header);
$message = implode("\n", $this->__message);
if (is_array($this->to)) {
$to = implode(', ', array_map(array($this, '__formatAddress'), $this->to));
} else {
$to = $this->to;
}
if (ini_get('safe_mode')) {
return @mail($this->to, $this->__encode($this->subject), $message, $header);
return @mail($to, $this->__encode($this->subject), $message, $header);
}
return @mail($this->to, $this->__encode($this->subject), $message, $header, $this->additionalParams);
return @mail($to, $this->__encode($this->subject), $message, $header, $this->additionalParams);
}
/**
@@ -748,8 +757,15 @@ function __smtp() {
return false;
}
if (!$this->__smtpSend('RCPT TO: ' . $this->__formatAddress($this->to, true))) {
return false;
if (!is_array($this->to)) {
$tos = array($this->to);
} else {
$tos = $this->to;
}
foreach ($tos as $to) {
if (!$this->__smtpSend('RCPT TO: ' . $this->__formatAddress($to, true))) {
return false;
}
}
foreach ($this->cc as $cc) {
@@ -814,12 +830,17 @@ function __debug() {
$message = implode($nl, $this->__message);
$fm = '<pre>';
if (is_array($this->to)) {
$to = implode(', ', array_map(array($this, '__formatAddress'), $this->to));
} else {
$to = $this->to;
}
if ($this->delivery == 'smtp') {
$fm .= sprintf('%s %s%s', 'Host:', $this->smtpOptions['host'], $nl);
$fm .= sprintf('%s %s%s', 'Port:', $this->smtpOptions['port'], $nl);
$fm .= sprintf('%s %s%s', 'Timeout:', $this->smtpOptions['timeout'], $nl);
}
$fm .= sprintf('%s %s%s', 'To:', $this->to, $nl);
$fm .= sprintf('%s %s%s', 'To:', $to, $nl);
$fm .= sprintf('%s %s%s', 'From:', $this->from, $nl);
$fm .= sprintf('%s %s%s', 'Subject:', $this->__encode($this->subject), $nl);
$fm .= sprintf('%s%3$s%3$s%s', 'Header:', $header, $nl);

0 comments on commit a20c809

Please sign in to comment.
You can’t perform that action at this time.