adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix SMTP Transparency (RFC5321 4.5.2. first line period)

Browse source
This commit is contained in:
Norio Suzuki 2012-05-07 22:34:14 +00:00
parent fe0c7d348a
commit db20600d02
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Network/Email/CakeEmail.php
View file

@ -1238,9 +1238,6 @@ class CakeEmail {
$formatted[] = ''; $formatted[] = '';
continue; continue;
} }
if ($line[0] === '.') {
$line = '.' . $line;
}
if (!preg_match('/\<[a-z]/i', $line)) { if (!preg_match('/\<[a-z]/i', $line)) {
$formatted = array_merge($formatted, explode("\n", wordwrap($line, self::LINE_LENGTH_SHOULD, "\n"))); $formatted = array_merge($formatted, explode("\n", wordwrap($line, self::LINE_LENGTH_SHOULD, "\n")));
continue; continue;

11
lib/Cake/Network/Email/SmtpTransport.php
View file

@ -168,7 +168,16 @@ class SmtpTransport extends AbstractTransport {
$headers = $this->_cakeEmail->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'subject')); $headers = $this->_cakeEmail->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'subject'));
$headers = $this->_headersToString($headers); $headers = $this->_headersToString($headers);
$message = implode("\r\n", $this->_cakeEmail->message()); $lines = $this->_cakeEmail->message();
$messages = array();
foreach ($lines as $line) {
if ((! empty($line)) && ($line[0] === '.')) {
$messages[] = '.' . $line;
} else {
$messages[] = $line;
}
}
$message = implode("\r\n", $messages);
$this->_smtpSend($headers . "\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.");
$this->_content = array('headers' => $headers, 'message' => $message); $this->_content = array('headers' => $headers, 'message' => $message);
} }

3
lib/Cake/Test/Case/Network/Email/DebugTransportTest.php
View file

@ -51,7 +51,7 @@ class DebugTransportTest extends CakeTestCase {
$email->subject('Testing Message'); $email->subject('Testing Message');
$date = date(DATE_RFC2822); $date = date(DATE_RFC2822);
$email->setHeaders(array('X-Mailer' => DebugCakeEmail::EMAIL_CLIENT, 'Date' => $date)); $email->setHeaders(array('X-Mailer' => DebugCakeEmail::EMAIL_CLIENT, 'Date' => $date));
$email->expects($this->any())->method('message')->will($this->returnValue(array('First Line', 'Second Line', ''))); $email->expects($this->any())->method('message')->will($this->returnValue(array('First Line', 'Second Line', '.Third Line', '')));
$headers = "From: CakePHP Test <noreply@cakephp.org>\r\n"; $headers = "From: CakePHP Test <noreply@cakephp.org>\r\n";
$headers .= "To: CakePHP <cake@cakephp.org>\r\n"; $headers .= "To: CakePHP <cake@cakephp.org>\r\n";
@ -66,6 +66,7 @@ class DebugTransportTest extends CakeTestCase {
$data = "First Line\r\n"; $data = "First Line\r\n";
$data .= "Second Line\r\n"; $data .= "Second Line\r\n";
$data .= ".Third Line\r\n"; // Not use 'RFC5321 4.5.2.Transparency' in DebugTransport.
$result = $this->DebugTransport->send($email); $result = $this->DebugTransport->send($email);

3
lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php
View file

@ -221,7 +221,7 @@ class SmtpTransportTest extends CakeTestCase {
$email->subject('Testing SMTP'); $email->subject('Testing SMTP');
$date = date(DATE_RFC2822); $date = date(DATE_RFC2822);
$email->setHeaders(array('X-Mailer' => SmtpCakeEmail::EMAIL_CLIENT, 'Date' => $date)); $email->setHeaders(array('X-Mailer' => SmtpCakeEmail::EMAIL_CLIENT, 'Date' => $date));
$email->expects($this->any())->method('message')->will($this->returnValue(array('First Line', 'Second Line', ''))); $email->expects($this->any())->method('message')->will($this->returnValue(array('First Line', 'Second Line', '.Third Line', '')));
$data = "From: CakePHP Test <noreply@cakephp.org>\r\n"; $data = "From: CakePHP Test <noreply@cakephp.org>\r\n";
$data .= "Return-Path: CakePHP Return <pleasereply@cakephp.org>\r\n"; $data .= "Return-Path: CakePHP Return <pleasereply@cakephp.org>\r\n";
@ -237,6 +237,7 @@ class SmtpTransportTest extends CakeTestCase {
$data .= "\r\n"; $data .= "\r\n";
$data .= "First Line\r\n"; $data .= "First Line\r\n";
$data .= "Second Line\r\n"; $data .= "Second Line\r\n";
$data .= "..Third Line\r\n"; // RFC5321 4.5.2.Transparency
$data .= "\r\n"; $data .= "\r\n";
$data .= "\r\n\r\n.\r\n"; $data .= "\r\n\r\n.\r\n";