Merge pull request #2110 from annando/1511-subscribe-feed

[friendica.git] / include / Emailer.php

diff --git a/include/Emailer.php b/include/Emailer.php
index 3c0f4047c612a864266db5d7a7e2edd54771f9da..d0568f600128a4f447fbaf4f2561865f613292bd 100644 (file)
--- a/include/Emailer.php
+++ b/include/Emailer.php
@@ -20,13 +20,18 @@ class Emailer {
 
                call_hooks('emailer_send_prepare', $params);
 
+               $email_textonly = False;
+               if (x($params,"uid")) {
+                       $email_textonly = get_pconfig($params['uid'], "system", "email_textonly");
+               }
+
                $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');
                $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
 
                // generate a mime boundary
                $mimeBoundary   =rand(0,9)."-"
-                               .rand(10000000000,9999999999)."-"
-                               .rand(10000000000,9999999999)."=:"
+                               .rand(10000000000,99999999999)."-"
+                               .rand(10000000000,99999999999)."=:"
                                .rand(10000,99999);
 
                // generate a multipart/alternative message header
@@ -44,11 +49,16 @@ class Emailer {
                        "--" . $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" .
+                       $textBody . "\n";
+
+               if (!$email_textonly && !is_null($params['htmlVersion'])){
+                       $multipartMessageBody .=
+                               "--" . $mimeBoundary . "\n" .                           // text/html section
+                               "Content-Type: text/html; charset=UTF-8\n" .
+                               "Content-Transfer-Encoding: base64\n\n" .
+                               $htmlBody . "\n";
+               }
+               $multipartMessageBody .=
                        "--" . $mimeBoundary . "--\n";                                  // message ending
 
                // send the message
@@ -58,12 +68,13 @@ class Emailer {
                        'body' => $multipartMessageBody,
                        'headers' => $messageHeader
                );
+               //echo "<pre>"; var_dump($hookdata); killme();
                call_hooks("emailer_send", $hookdata);
                $res = mail(
                        $hookdata['to'],                                                        // send to address
                        $hookdata['subject'],                                           // subject
                        $hookdata['body'],                                                      // message body
-                       $hookdata['headers'],                                           // message headers
+                       $hookdata['headers']                                            // message headers
                );
                logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
                logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG);