diff options
| author | zotlabs <mike@macgirvin.com> | 2019-03-16 15:28:21 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-03-16 15:28:21 -0700 |
| commit | a976f418e35a8f4651441a952c8f4c037cb8d2f9 (patch) | |
| tree | 1465ff1c354e49d863fa8df3ac05e572aeb8c6b1 | |
| parent | 3c701e780c31a497c8c81ad0a66221e90b6078a4 (diff) | |
| download | volse-hubzilla-a976f418e35a8f4651441a952c8f4c037cb8d2f9.tar.gz volse-hubzilla-a976f418e35a8f4651441a952c8f4c037cb8d2f9.tar.bz2 volse-hubzilla-a976f418e35a8f4651441a952c8f4c037cb8d2f9.zip | |
use php_eol for all mail header generation
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 24 | ||||
| -rw-r--r-- | include/network.php | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 5e5798cac..a7082f45a 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -754,9 +754,9 @@ class Enotify { // generate a multipart/alternative message header $messageHeader = $params['additionalMailHeader'] . - "From: $fromName <{$params['fromEmail']}>\n" . - "Reply-To: $fromName <{$params['replyTo']}>\n" . - "MIME-Version: 1.0\n" . + "From: $fromName <{$params['fromEmail']}>" . PHP_EOL . + "Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL . + "MIME-Version: 1.0" . PHP_EOL . "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; // assemble the final multipart message body with the text and html types included @@ -764,15 +764,15 @@ class Enotify { $htmlBody = chunk_split(base64_encode($params['htmlVersion'])); $multipartMessageBody = - "--" . $mimeBoundary . "\n" . // plain text section - "Content-Type: text/plain; charset=UTF-8\n" . - "Content-Transfer-Encoding: base64\n\n" . - $textBody . "\n" . - "--" . $mimeBoundary . "\n" . // text/html section - "Content-Type: text/html; charset=UTF-8\n" . - "Content-Transfer-Encoding: base64\n\n" . - $htmlBody . "\n" . - "--" . $mimeBoundary . "--\n"; // message ending + "--" . $mimeBoundary . PHP_EOL . // plain text section + "Content-Type: text/plain; charset=UTF-8" . PHP_EOL . + "Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL . + $textBody . PHP_EOL . + "--" . $mimeBoundary . PHP_EOL . // text/html section + "Content-Type: text/html; charset=UTF-8" . PHP_EOL . + "Content-Transfer-Encoding: base64" . PHP_EOL . PHP_EOL . + $htmlBody . PHP_EOL . + "--" . $mimeBoundary . "--" . PHP_EOL; // message ending // send the message $res = mail( diff --git a/include/network.php b/include/network.php index 4ef976df0..c754625cd 100644 --- a/include/network.php +++ b/include/network.php @@ -1799,8 +1799,8 @@ function z_mail($params) { $messageHeader = $params['additionalMailHeader'] . - "From: $fromName <{$params['fromEmail']}>\n" . - "Reply-To: $fromName <{$params['replyTo']}>\n" . + "From: $fromName <{$params['fromEmail']}>" . PHP_EOL . + "Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL . "Content-Type: text/plain; charset=UTF-8"; // send the message |