diff options
| author | Mario <mario@mariovavti.com> | 2019-03-18 09:35:53 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-03-18 09:35:53 +0100 |
| commit | 51156d058232969d55032f045859e46bb3a09162 (patch) | |
| tree | 4f2dea61bdc49be73de4ae00fc4e22937361df3e /Zotlabs/Lib | |
| parent | e28bde6ccdb03b370df1dbc8654d69c905b8a235 (diff) | |
| parent | ea9925f489602529891c0ed468cf35117e7ef454 (diff) | |
| download | volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.tar.gz volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.tar.bz2 volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.zip | |
Merge branch 'dev' into 'dev'
misc fixes
See merge request hubzilla/core!1558
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 24 |
1 files changed, 12 insertions, 12 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( |