adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-05 19:12:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adapted the mail and smtp transports to the getHeaders return.

Browse source
This commit is contained in:
Juan Basso 2011-03-01 15:24:38 -03:00
parent 6930ba6207
commit 131a62f9cb
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/email/mail_transport.php
View file

@ -35,9 +35,11 @@ class MailTransport extends AbstractTransport {
if (!$eol) {
$eol = PHP_EOL;
}
$header = $this->_headersToString($email->getHeaders(true, true, false), $eol);
$headers = $email->getHeaders(array_fill_keys(array('from', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc'), true));
$to = $headers['To'];
unset($headers['To']);
$header = $this->_headersToString($headers, $eol);
$message = implode($eol, $email->getMessage());
$to = key($email->getTo());
if (ini_get('safe_mode')) {
return @mail($to, $email->getSubject(), $message, $header);
}

5
cake/libs/email/smtp_transport.php
View file

@ -160,9 +160,10 @@ class SmtpTransport extends AbstractTransport {
protected function _sendData() {
$this->_smtpSend('DATA', '354');
$header = $this->_headersToString($this->_cakeEmail->getHeaders(true, false, true));
$headers = $this->_cakeEmail->getHeaders(array_fill_keys(array('from', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'), true));
$headers = $this->_headersToString($headers);
$message = implode("\r\n", $this->_cakeEmail->getMessage());
$this->_smtpSend($header . "\r\n\r\n" . $message . "\r\n\r\n\r\n.");
$this->_smtpSend($headers . "\r\n\r\n" . $message . "\r\n\r\n\r\n.");
}
/**