adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

"Fixes #3820, Email Component only sends message if using template and layout.

Browse source 
Fixes #4019, email component: attaching file is broke, fixes undefined variable, allows full paths to attachment.
Fixes #4171, Email Component: Lost a head line 'period' via SMTP method.
"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6522 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2008-03-08 20:26:16 +00:00
parent 58e6da6a5b
commit 63144591c6
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cake/libs/controller/components/email.php
View file

@ -506,6 +506,7 @@ class EmailComponent extends Object{
* @access private * @access private
*/ */
function __attachFiles() { function __attachFiles() {
$files = array();
foreach ($this->attachments as $attachment) { foreach ($this->attachments as $attachment) {
$file = $this->__findFiles($attachment); $file = $this->__findFiles($attachment);
if (!empty($file)) { if (!empty($file)) {
@ -538,6 +539,9 @@ class EmailComponent extends Object{
* @access private * @access private
*/ */
function __findFiles($attachment) { function __findFiles($attachment) {
if (file_exists($attachment)) {
return $attachment;
}
foreach ($this->filePaths as $path) { foreach ($this->filePaths as $path) {
if (file_exists($path . DS . $attachment)) { if (file_exists($path . DS . $attachment)) {
$file = $path . DS . $attachment; $file = $path . DS . $attachment;
@ -556,14 +560,17 @@ class EmailComponent extends Object{
function __wrap($message) { function __wrap($message) {
$message = $this->__strip($message, true); $message = $this->__strip($message, true);
$message = str_replace(array("\r\n","\r"), "\n", $message); $message = str_replace(array("\r\n","\r"), "\n", $message);
$words = explode("\n", $message); $lines = explode("\n", $message);
$formated = null; $formatted = null;
foreach ($words as $word) { foreach ($lines as $line) {
$formated .= wordwrap($word, $this->_lineLength, $this->_newLine, true); if(substr($line, 0, 1) == '.') {
$formated .= $this->_newLine; $line = '.' . $line;
} }
return $formated; $formatted .= wordwrap($line, $this->_lineLength, $this->_newLine, true);
$formatted .= $this->_newLine;
}
return $formatted;
} }
/** /**
* Encode the specified string using the current charset * Encode the specified string using the current charset
@ -687,7 +694,7 @@ class EmailComponent extends Object{
return false; return false;
} }
if (!$this->__sendData($this->__header . "\r\n" . $this->__message . "\r\n\r\n\r\n.\r\n")) { if (!$this->__sendData($this->__header . "\r\n\r\n" . $this->__message . "\r\n\r\n\r\n.\r\n")) {
return false; return false;
} }
$this->__sendData("QUIT\r\n", false); $this->__sendData("QUIT\r\n", false);

1
cake/libs/view/layouts/email/text/default.ctp
View file

@ -24,7 +24,6 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License * @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/ */
?> ?>
<?php echo $content_for_layout;?> <?php echo $content_for_layout;?>
This email was sent using the CakePHP Framework, http://cakephp.org. This email was sent using the CakePHP Framework, http://cakephp.org.