mirror of https://github.com/arendst/Tasmota.git
corrected a mixup of MIME multipart and simple plain text email messages
This commit is contained in:
parent
e105d5b4f4
commit
1959291bdd
|
@ -331,11 +331,6 @@ String buffer;
|
|||
goto exit;
|
||||
}
|
||||
|
||||
buffer = F("MIME-Version: 1.0\r\n");
|
||||
client->print(buffer);
|
||||
buffer = F("Content-Type: Multipart/mixed; boundary=frontier\r\n");
|
||||
client->print(buffer);
|
||||
|
||||
buffer = F("From: ");
|
||||
buffer += from;
|
||||
client->println(buffer);
|
||||
|
@ -350,22 +345,27 @@ String buffer;
|
|||
#endif
|
||||
buffer = F("Subject: ");
|
||||
buffer += subject;
|
||||
buffer += F("\r\n");
|
||||
client->println(buffer);
|
||||
#ifdef DEBUG_EMAIL_PORT
|
||||
AddLog_P(LOG_LEVEL_INFO, PSTR("%s"),buffer.c_str());
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef USE_SCRIPT
|
||||
if (*msg=='*' && *(msg+1)==0) {
|
||||
buffer = F("MIME-Version: 1.0\r\n");
|
||||
client->print(buffer);
|
||||
buffer = F("Content-Type: Multipart/mixed; boundary=frontier\r\n\r\n");
|
||||
client->print(buffer);
|
||||
|
||||
g_client=client;
|
||||
script_send_email_body(xsend_message_txt);
|
||||
} else {
|
||||
#endif
|
||||
buffer = F("\r\n");
|
||||
client->print(buffer);
|
||||
client->println(msg);
|
||||
#ifdef USE_SCRIPT
|
||||
}
|
||||
#else
|
||||
client->println(msg);
|
||||
#endif
|
||||
client->println('.');
|
||||
#ifdef DEBUG_EMAIL_PORT
|
||||
|
|
Loading…
Reference in New Issue