Skip to content

Fix incorrect processing of nameTok #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
judismith wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix incorrect processing of nameTok #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51b4e6
Fix incorrect processing of nameTox
judismith May 26, 2017
de71014
Update ESPMailer.cpp
soundstorm Aug 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions ESPMailer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ boolean ESPMailer::HeaderTo(const char* type, char* arr, char* nameArr) {
char* tok = strtok(arr, _delim);
char* nameTok = strtok(nameArr, _delim);
while (tok != NULL) {
if (strcmp(nameTok, "\r"))
if (strcmp(nameTok, "\r") == 0)
_smtp.printf("%s: <%s>\r\n", type, tok);
else
_smtp.printf("%s: \"%s\" <%s>\r\n", type, nameTok, tok);
Expand All @@ -203,7 +203,7 @@ boolean ESPMailer::send() {

NTP ntp = NTP();
ntp.begin();

char* buf = (char*)malloc(100);
if (!_smtp.connect(Host.c_str(), Port)) {
if (do_debug >= 0) {
Expand All @@ -214,10 +214,10 @@ boolean ESPMailer::send() {
return false;
}
if (!sendCMD(NULL,220)) return false;

sprintf(buf, "HELO %s", Host.c_str());
if (!sendCMD(buf,250)) return false;

//Does not work - for now.
if (TLS) {
if (sendCMD("STARTTLS",220)) {
Expand All @@ -229,7 +229,7 @@ boolean ESPMailer::send() {
return false;
}
}

if (SMTPAuth) {
switch (AuthType) {
case PLAIN: {
Expand Down Expand Up @@ -269,14 +269,14 @@ boolean ESPMailer::send() {
}
}
}

sprintf(buf, "MAIL FROM:<%s>", _from);
if (!sendCMD(buf,250)) return false;

if (!SMTPTo(_to)) return false;
if (!SMTPTo(_cc)) return false;
if (!SMTPTo(_bcc)) return false;

if (!sendCMD("DATA",354)) return false;

time_t tm = ntp.get(_timezone);
Expand All @@ -294,23 +294,23 @@ boolean ESPMailer::send() {
(int)(_timezone),
floor(_timezone) == _timezone ? 0 : 30
);

_smtp.printf("Message-Id: <%ld%ld@%s>\r\n", ESP.getChipId(),ESP.getCycleCount(), Host.c_str());
_smtp.println("X-Mailer: ESPMailer v2.0 (http://github.com/ArduinoHannover/ESPMailer)");
_smtp.printf("Subject: %s\r\n", Subject.c_str());
if (_fromName != NULL)
_smtp.printf("From: \"%s\" <%s>\r\n", _fromName, _from);
else
_smtp.printf("From: <%s>\r\n", _from);


if (_to != NULL)
HeaderTo("To", _to, _toNames);
if (_cc != NULL)
HeaderTo("CC", _cc, _ccNames);
if (_bcc != NULL)
HeaderTo("BCC", _bcc, _bccNames);

if (AltBody.length() && html) {
_smtp.println("MIME-Version: 1.0");
_smtp.println("Content-Type: multipart/mixed; boundary=\"=ESP_MAIL_PART_MFASLAGAD\"");
Expand Down